[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 15/20] monitor: add qmp_return_get_monitor()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v4 15/20] monitor: add qmp_return_get_monitor() |
Date: |
Tue, 9 Apr 2019 18:10:04 +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 c1b40a9cac..5f25cd2616 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 __thread Monitor *cur_mon;
@@ -51,4 +52,6 @@ int monitor_fdset_dup_fd_find(int dup_fd);
void monitor_vfprintf(FILE *stream,
const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0);
+Monitor *qmp_return_get_monitor(QmpReturn *qret);
+
#endif /* MONITOR_H */
diff --git a/monitor.c b/monitor.c
index b1c4647a37..76bc2f8c7c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -324,6 +324,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.21.0.196.g041f5ea1cf
- [Qemu-devel] [PATCH v4 04/20] QmpSession: add a return callback, (continued)
- [Qemu-devel] [PATCH v4 04/20] QmpSession: add a return callback, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 05/20] QmpSession: add json parser and use it in qga, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 06/20] monitor: use qmp session to parse json feed, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 07/20] qga: simplify dispatch_return_cb, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 08/20] QmpSession: introduce QmpReturn, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 09/20] qmp: simplify qmp_return_error(), Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 11/20] QmpSession: return orderly, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 12/20] qmp: introduce asynchronous command type, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 13/20] scripts: learn 'async' qapi commands, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 14/20] qmp: add qmp_return_is_cancelled(), Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 15/20] monitor: add qmp_return_get_monitor(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH v4 16/20] console: add graphic_hw_update_done(), Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 10/20] QmpSession: keep a queue of pending commands, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 17/20] console: make screendump asynchronous, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 18/20] monitor: start making qmp_human_monitor_command() asynchronous, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 19/20] monitor: teach HMP about asynchronous commands, Marc-André Lureau, 2019/04/09
- [Qemu-devel] [PATCH v4 20/20] hmp: call the asynchronous QMP screendump to fix outdated/glitches, Marc-André Lureau, 2019/04/09
- Re: [Qemu-devel] [PATCH v4 00/20] monitor: add asynchronous command type, no-reply, 2019/04/09
- Re: [Qemu-devel] [PATCH v4 00/20] monitor: add asynchronous command type, no-reply, 2019/04/09