[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/38] monitor: further simplify previous patch
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 05/38] monitor: further simplify previous patch |
Date: |
Mon, 26 Mar 2018 17:08:43 +0200 |
Move the resume code to the non-oob path. This patch could eventually
be squashed with the previous patch.
Signed-off-by: Marc-André Lureau <address@hidden>
---
monitor.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/monitor.c b/monitor.c
index 2428c7fcd4..a8dcfa283e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3957,16 +3957,14 @@ typedef struct QMPRequest QMPRequest;
* Dispatch one single QMP request. The function will free the req_obj
* and objects inside it before return.
*/
-static void monitor_qmp_dispatch_one(QMPRequest *req_obj, bool oob_cmd)
+static void monitor_qmp_dispatch_one(QMPRequest *req_obj)
{
Monitor *mon, *old_mon;
QObject *req, *rsp = NULL, *id;
- bool need_resume;
req = req_obj->req;
mon = req_obj->mon;
id = req_obj->id;
- need_resume = !oob_cmd && !qmp_oob_enabled(mon);
g_free(req_obj);
@@ -3986,11 +3984,6 @@ static void monitor_qmp_dispatch_one(QMPRequest
*req_obj, bool oob_cmd)
/* Respond if necessary */
monitor_qmp_respond(mon, rsp, NULL, id);
- /* This pairs with the monitor_suspend() in handle_qmp_command(). */
- if (need_resume) {
- monitor_resume(mon);
- }
-
qobject_decref(req);
}
@@ -4036,8 +4029,14 @@ static void monitor_qmp_bh_dispatcher(void *data)
QMPRequest *req_obj = monitor_qmp_requests_pop_one();
if (req_obj) {
+ Monitor *mon = req_obj->mon;
+ bool need_resume = !qmp_oob_enabled(mon);
trace_monitor_qmp_cmd_in_band(qobject_get_try_str(req_obj->id) ?: "");
- monitor_qmp_dispatch_one(req_obj, false);
+ monitor_qmp_dispatch_one(req_obj);
+ /* This pairs with the monitor_suspend() in handle_qmp_command(). */
+ if (need_resume) {
+ monitor_resume(mon);
+ }
/* Reschedule instead of looping so the main loop stays responsive */
qemu_bh_schedule(mon_global.qmp_dispatcher_bh);
}
@@ -4095,7 +4094,7 @@ static void handle_qmp_command(JSONMessageParser *parser,
GQueue *tokens)
/* Out-Of-Band (OOB) requests are executed directly in parser. */
trace_monitor_qmp_cmd_out_of_band(qobject_get_try_str(req_obj->id)
?: "");
- monitor_qmp_dispatch_one(req_obj, true);
+ monitor_qmp_dispatch_one(req_obj);
return;
}
--
2.17.0.rc1.1.g4c4f2b46a3
- [Qemu-devel] [PATCH v3 00/38] RFC: monitor: add asynchronous command type, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 03/38] Revert "qmp: isolate responses into io thread", Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 04/38] monitor: no need to save need_resume, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 02/38] qmp-shell: learn to send commands with quoted arguments, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 01/38] HACK: add back OOB, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 06/38] monitor: no need to remove desc before replacing it, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 05/38] monitor: further simplify previous patch,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 09/38] json: remove useless return value from lexer/parser, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 08/38] json-lexer: make it safe to call multiple times, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 07/38] json-parser: always set an error if return NULL, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 10/38] tests: add a few qemu-qmp tests, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 13/38] qga: process_event() simplification, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 14/38] monitor: simplify monitor_qmp_respond(), Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 11/38] tests: change /0.15/* tests to /qmp/*, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 12/38] tests: add a qmp success-response test, Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 15/38] qmp: pass and return a QDict to qmp_dispatch(), Marc-André Lureau, 2018/03/26
- [Qemu-devel] [PATCH v3 17/38] qmp: constify qmp_is_oob(), Marc-André Lureau, 2018/03/26