[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 06/23] monitor: move the cur_mon hack deeper for
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v7 06/23] monitor: move the cur_mon hack deeper for QMP |
Date: |
Wed, 24 Jan 2018 13:39:40 +0800 |
In monitor_qmp_read(), we have the hack to temporarily replace the
cur_mon pointer. Now we move this hack deeper inside the QMP dispatcher
routine since the Monitor pointer can be actually obtained using
container_of() upon the parser object, just like most of the other JSON
parser users do.
This does not make much sense as a single patch. However, this will be
a big step for the next patch, when the QMP dispatcher routine will be
split from the QMP parser.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
monitor.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/monitor.c b/monitor.c
index 3a28a6d935..253be6871a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3811,7 +3811,9 @@ static void handle_qmp_command(JSONMessageParser *parser,
GQueue *tokens)
{
QObject *req, *rsp = NULL, *id = NULL;
QDict *qdict = NULL;
- Monitor *mon = cur_mon;
+ MonitorQMP *mon_qmp = container_of(parser, MonitorQMP, parser);
+ Monitor *old_mon, *mon = container_of(mon_qmp, Monitor, qmp);
+
Error *err = NULL;
req = json_parser_parse_err(tokens, NULL, &err);
@@ -3836,8 +3838,13 @@ static void handle_qmp_command(JSONMessageParser
*parser, GQueue *tokens)
QDECREF(req_json);
}
+ old_mon = cur_mon;
+ cur_mon = mon;
+
rsp = qmp_dispatch(cur_mon->qmp.commands, req);
+ cur_mon = old_mon;
+
if (mon->qmp.commands == &qmp_cap_negotiation_commands) {
qdict = qdict_get_qdict(qobject_to_qdict(rsp), "error");
if (qdict
@@ -3874,13 +3881,9 @@ err_out:
static void monitor_qmp_read(void *opaque, const uint8_t *buf, int size)
{
- Monitor *old_mon = cur_mon;
-
- cur_mon = opaque;
-
- json_message_parser_feed(&cur_mon->qmp.parser, (const char *) buf, size);
+ Monitor *mon = opaque;
- cur_mon = old_mon;
+ json_message_parser_feed(&mon->qmp.parser, (const char *) buf, size);
}
static void monitor_read(void *opaque, const uint8_t *buf, int size)
--
2.14.3
- [Qemu-devel] [PATCH v7 00/23] QMP: out-of-band (OOB) execution support, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 01/23] docs: update QMP documents for OOB commands, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 02/23] qobject: introduce qstring_get_try_str(), Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 03/23] qobject: introduce qobject_get_try_str(), Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 04/23] qobject: let object_property_get_str() use new API, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 05/23] monitor: move skip_flush into monitor_data_init, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 06/23] monitor: move the cur_mon hack deeper for QMP,
Peter Xu <=
- [Qemu-devel] [PATCH v7 07/23] monitor: unify global init, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 08/23] monitor: let mon_list be tail queue, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 09/23] monitor: allow using IO thread for parsing, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 10/23] qmp: introduce QMPCapability, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 11/23] monitor: introduce monitor_qmp_respond(), Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 12/23] monitor: let suspend_cnt be thread safe, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 13/23] monitor: let suspend/resume work even with QMPs, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 14/23] monitor: separate QMP parser and dispatcher, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 15/23] qmp: add new event "command-dropped", Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 16/23] monitor: send event when command queue full, Peter Xu, 2018/01/24