[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 32/38] monitor: add qmp_return_get_monitor()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 32/38] monitor: add qmp_return_get_monitor() |
Date: |
Mon, 26 Mar 2018 17:09:10 +0200 |
If necessary, add an helper that can be used to retrieve the
associated monitor. This is useful for asynchronous commands that may
have to update cur_mon for various reasons.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/monitor/monitor.h | 3 +++
monitor.c | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 0cb0538a31..2052a6b4e4 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -5,6 +5,7 @@
#include "block/block.h"
#include "qapi/qapi-types-misc.h"
#include "qemu/readline.h"
+#include "qapi/qmp/dispatch.h"
extern Monitor *cur_mon;
@@ -46,4 +47,6 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd);
void monitor_fdset_dup_fd_remove(int dup_fd);
int monitor_fdset_dup_fd_find(int dup_fd);
+Monitor *qmp_return_get_monitor(QmpReturn *qret);
+
#endif /* MONITOR_H */
diff --git a/monitor.c b/monitor.c
index 73a06d4156..f7826f5626 100644
--- a/monitor.c
+++ b/monitor.c
@@ -281,6 +281,12 @@ bool monitor_cur_is_qmp(void)
return cur_mon && monitor_is_qmp(cur_mon);
}
+Monitor *qmp_return_get_monitor(QmpReturn *qret)
+{
+ return qret->session ?
+ container_of(qret->session, Monitor, qmp.session) : NULL;
+}
+
void monitor_read_command(Monitor *mon, int show_prompt)
{
if (!mon->rs)
--
2.17.0.rc1.1.g4c4f2b46a3
- [Qemu-devel] [PATCH v3 27/38] QmpSession: keep a queue of pending commands, (continued)
- [Qemu-devel] [PATCH v3 27/38] QmpSession: keep a queue of pending commands, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 25/38] qmp: remove need for qobject_from_jsonf(), Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 28/38] QmpSession: return orderly, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 30/38] scripts: learn 'async' qapi commands, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 29/38] qmp: introduce asynchronous command type, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 31/38] qmp: add qmp_return_is_cancelled(), Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 33/38] console: graphic_hw_update return true if async, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 34/38] console: add graphic_hw_update_done(), Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 35/38] console: make screendump asynchronous, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 36/38] monitor: start making qmp_human_monitor_command() asynchronous, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 32/38] monitor: add qmp_return_get_monitor(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 37/38] monitor: teach HMP about asynchronous commands, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 38/38] hmp: call the asynchronous QMP screendump to fix outdated/glitches, Marc-André Lureau, 2018/03/26
- Re: [Qemu-devel] [PATCH v3 00/38] RFC: monitor: add asynchronous command type, Dr. David Alan Gilbert, 2018/03/26
- Re: [Qemu-devel] [PATCH v3 00/38] RFC: monitor: add asynchronous command type, no-reply, 2018/03/26
- Re: [Qemu-devel] [PATCH v3 00/38] RFC: monitor: add asynchronous command type, no-reply, 2018/03/27