[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 11/23] monitor: introduce monitor_qmp_respond()
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v7 11/23] monitor: introduce monitor_qmp_respond() |
Date: |
Wed, 24 Jan 2018 13:39:45 +0800 |
A tiny refactoring, preparing to split the QMP dispatcher away.
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
monitor.c | 50 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 17 deletions(-)
diff --git a/monitor.c b/monitor.c
index 3e07798442..92114aaa80 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3867,6 +3867,38 @@ static int monitor_can_read(void *opaque)
return (mon->suspend_cnt == 0) ? 1 : 0;
}
+/*
+ * 1. This function takes ownership of rsp, err, and id.
+ * 2. rsp, err, and id may be NULL.
+ * 3. If err != NULL then rsp must be NULL.
+ */
+static void monitor_qmp_respond(Monitor *mon, QObject *rsp,
+ Error *err, QObject *id)
+{
+ QDict *qdict = NULL;
+
+ if (err) {
+ assert(!rsp);
+ qdict = qdict_new();
+ qdict_put_obj(qdict, "error", qmp_build_error_object(err));
+ error_free(err);
+ rsp = QOBJECT(qdict);
+ }
+
+ if (rsp) {
+ if (id) {
+ /* This is for the qdict below. */
+ qobject_incref(id);
+ qdict_put_obj(qobject_to_qdict(rsp), "id", id);
+ }
+
+ monitor_json_emitter(mon, rsp);
+ }
+
+ qobject_decref(id);
+ qobject_decref(rsp);
+}
+
static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
{
QObject *req, *rsp = NULL, *id = NULL;
@@ -3918,24 +3950,8 @@ static void handle_qmp_command(JSONMessageParser
*parser, GQueue *tokens)
}
err_out:
- if (err) {
- qdict = qdict_new();
- qdict_put_obj(qdict, "error", qmp_build_error_object(err));
- error_free(err);
- rsp = QOBJECT(qdict);
- }
+ monitor_qmp_respond(mon, rsp, err, id);
- if (rsp) {
- if (id) {
- qdict_put_obj(qobject_to_qdict(rsp), "id", id);
- id = NULL;
- }
-
- monitor_json_emitter(mon, rsp);
- }
-
- qobject_decref(id);
- qobject_decref(rsp);
qobject_decref(req);
}
--
2.14.3
- [Qemu-devel] [PATCH v7 01/23] docs: update QMP documents for OOB commands, (continued)
- [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, 2018/01/24
- [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 <=
- [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
- [Qemu-devel] [PATCH v7 17/23] qapi: introduce new cmd option "allow-oob", Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 18/23] qmp: support out-of-band (oob) execution, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 19/23] qmp: isolate responses into io thread, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 20/23] monitor: enable IO thread for (qmp & !mux) typed, Peter Xu, 2018/01/24
- [Qemu-devel] [PATCH v7 21/23] qmp: add command "x-oob-test", Peter Xu, 2018/01/24