[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 14/27] monitor: introduce monitor_qmp_respond()
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v4 14/27] monitor: introduce monitor_qmp_respond() |
Date: |
Thu, 16 Nov 2017 21:05:57 +0800 |
A tiny refactoring, preparing to split the QMP dispatcher away.
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
monitor.c | 48 +++++++++++++++++++++++++++++++-----------------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/monitor.c b/monitor.c
index 655c25041c..ec03f1b232 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3877,6 +3877,36 @@ static int monitor_can_read(void *opaque)
return (mon->suspend_cnt == 0) ? 1 : 0;
}
+/*
+ * When rsp/err/id is passed in, the function will be responsible for
+ * the cleanup.
+ */
+static void monitor_qmp_respond(Monitor *mon, QObject *rsp,
+ Error *err, QObject *id)
+{
+ QDict *qdict = NULL;
+
+ if (err) {
+ 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,
void *opaque)
{
@@ -3927,24 +3957,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.13.6
- [Qemu-devel] [RFC v4 08/27] monitor: let mon_list be tail queue, (continued)
[Qemu-devel] [RFC v4 11/27] qmp: introduce QMPCapability, Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 13/27] qmp: introduce some capability helpers, Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 12/27] qmp: negociate QMP capabilities, Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 14/27] monitor: introduce monitor_qmp_respond(),
Peter Xu <=
[Qemu-devel] [RFC v4 15/27] monitor: let monitor_{suspend|resume} thread safe, Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 16/27] monitor: separate QMP parser and dispatcher, Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 17/27] qmp: add new event "request-dropped", Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 18/27] monitor: send event when request queue full, Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 19/27] qapi: introduce new cmd option "allow-oob", Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 20/27] qmp: support out-of-band (oob) execution, Peter Xu, 2017/11/16
[Qemu-devel] [RFC v4 21/27] qmp: let migrate-incoming allow out-of-band, Peter Xu, 2017/11/16