[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 24/32] qmp: Replace monitor_json_emitter{, raw}()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 24/32] qmp: Replace monitor_json_emitter{, raw}() by qmp_{queue, send}_response() |
Date: |
Tue, 3 Jul 2018 23:35:48 +0200 |
monitor_json_emitter() and monitor_json_emitter_raw() are
unnecessarily general: they can send arbitrary JSON values, even
though we only ever use them for QMP, which may send only JSON
objects.
Specialize the argument from QObject * to QDict *, and rename to
qmp_queue_response(), qmp_send_response().
All callers but one lose an upcast. The lone exception gains a
downcast; the next commit will get rid of it.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
monitor.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/monitor.c b/monitor.c
index 8237b1c916..50dc57c82e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -503,9 +503,9 @@ int monitor_fprintf(FILE *stream, const char *fmt, ...)
return 0;
}
-static void monitor_json_emitter_raw(Monitor *mon,
- QObject *data)
+static void qmp_send_response(Monitor *mon, QDict *rsp)
{
+ QObject *data = QOBJECT(rsp);
QString *json;
json = mon->flags & MONITOR_USE_PRETTY ? qobject_to_json_pretty(data) :
@@ -518,7 +518,7 @@ static void monitor_json_emitter_raw(Monitor *mon,
qobject_unref(json);
}
-static void monitor_json_emitter(Monitor *mon, QObject *data)
+static void qmp_queue_response(Monitor *mon, QDict *rsp)
{
if (mon->use_io_thread) {
/*
@@ -528,8 +528,7 @@ static void monitor_json_emitter(Monitor *mon, QObject
*data)
* responder thread).
*/
qemu_mutex_lock(&mon->qmp.qmp_queue_lock);
- g_queue_push_tail(mon->qmp.qmp_responses,
- qobject_ref(qobject_to(QDict, data)));
+ g_queue_push_tail(mon->qmp.qmp_responses, qobject_ref(rsp));
qemu_mutex_unlock(&mon->qmp.qmp_queue_lock);
qemu_bh_schedule(qmp_respond_bh);
} else {
@@ -537,7 +536,7 @@ static void monitor_json_emitter(Monitor *mon, QObject
*data)
* If not using monitor I/O thread, then we are in main thread.
* Do the emission right away.
*/
- monitor_json_emitter_raw(mon, data);
+ qmp_send_response(mon, rsp);
}
}
@@ -563,7 +562,7 @@ static void monitor_qmp_response_flush(Monitor *mon)
QDict *data;
while ((data = monitor_qmp_response_pop_one(mon))) {
- monitor_json_emitter_raw(mon, QOBJECT(data));
+ qmp_send_response(mon, data);
qobject_unref(data);
}
}
@@ -595,7 +594,7 @@ static void monitor_qmp_bh_responder(void *opaque)
QMPResponse response;
while (monitor_qmp_response_pop_any(&response)) {
- monitor_json_emitter_raw(response.mon, QOBJECT(response.data));
+ qmp_send_response(response.mon, response.data);
qobject_unref(response.data);
}
}
@@ -622,7 +621,7 @@ static void monitor_qapi_event_emit(QAPIEvent event, QDict
*qdict)
QTAILQ_FOREACH(mon, &mon_list, entry) {
if (monitor_is_qmp(mon)
&& mon->qmp.commands != &qmp_cap_negotiation_commands) {
- monitor_json_emitter(mon, QOBJECT(qdict));
+ qmp_queue_response(mon, qdict);
}
}
}
@@ -4118,7 +4117,7 @@ static void monitor_qmp_respond(Monitor *mon, QDict *rsp,
qdict_put_obj(rsp, "id", qobject_ref(id));
}
- monitor_json_emitter(mon, QOBJECT(rsp));
+ qmp_queue_response(mon, rsp);
}
qobject_unref(id);
@@ -4418,7 +4417,7 @@ static void monitor_qmp_event(void *opaque, int event)
mon->qmp.commands = &qmp_cap_negotiation_commands;
monitor_qmp_caps_reset(mon);
data = get_qmp_greeting(mon);
- monitor_json_emitter(mon, data);
+ qmp_queue_response(mon, qobject_to(QDict, data));
qobject_unref(data);
mon_refcount++;
break;
--
2.17.1
- [Qemu-devel] [PULL v2 16/32] tests/qmp-test: Demonstrate QMP errors jumping the queue, (continued)
- [Qemu-devel] [PULL v2 16/32] tests/qmp-test: Demonstrate QMP errors jumping the queue, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 27/32] qmp: Add some comments around null responses, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 20/32] monitor: Peel off @mon_global wrapper, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 15/32] qmp: Simplify code around monitor_qmp_dispatch_one(), Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 08/32] tests/test-qga: Demonstrate the guest-agent ignores "id", Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 07/32] qmp: Make "id" optional again even in "oob" monitors, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 21/32] qobject: New qdict_from_jsonf_nofail(), Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 30/32] qmp: Clean up capability negotiation after commit 02130314d8c, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 23/32] qmp: Use QDict * instead of QObject * for response objects, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 12/32] qmp: Redo how the client requests out-of-band execution, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 24/32] qmp: Replace monitor_json_emitter{, raw}() by qmp_{queue, send}_response(),
Markus Armbruster <=
- [Qemu-devel] [PULL v2 25/32] qmp: Replace get_qmp_greeting() by qmp_greeting(), Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 22/32] qmp: De-duplicate error response building, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 17/32] qmp: Don't let malformed in-band commands jump the queue, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 28/32] qmp: Switch timestamp_put() to qdict_from_jsonf_nofail(), Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 31/32] monitor: Improve some comments, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 11/32] qmp qemu-ga: Fix qemu-ga not to accept "control", Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 06/32] tests/qmp-test: Test in-band command doesn't overtake, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 01/32] qmp: Say "out-of-band" instead of "Out-Of-Band", Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 29/32] qobject: Let qobject_from_jsonf() fail instead of abort, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL v2 26/32] qmp: Simplify monitor_qmp_respond(), Markus Armbruster, 2018/07/03