[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 04/12] qmp: Assert that no other monitor is active
From: |
Kevin Wolf |
Subject: |
[PATCH v6 04/12] qmp: Assert that no other monitor is active |
Date: |
Thu, 28 May 2020 17:37:34 +0200 |
monitor_qmp_dispatch() is never supposed to be called in the context of
another monitor, so assert that monitor_cur() is NULL instead of saving
and restoring it.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
monitor/qmp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/monitor/qmp.c b/monitor/qmp.c
index 5e9abd4711..a04c512e3a 100644
--- a/monitor/qmp.c
+++ b/monitor/qmp.c
@@ -135,16 +135,15 @@ static void monitor_qmp_respond(MonitorQMP *mon, QDict
*rsp)
static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
{
- Monitor *old_mon;
QDict *rsp;
QDict *error;
- old_mon = monitor_cur();
+ assert(monitor_cur() == NULL);
monitor_set_cur(&mon->common);
rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon));
- monitor_set_cur(old_mon);
+ monitor_set_cur(NULL);
if (mon->commands == &qmp_cap_negotiation_commands) {
error = qdict_get_qdict(rsp, "error");
--
2.25.4
- Re: [PATCH v6 02/12] monitor: Use getter/setter functions for cur_mon, (continued)
- [PATCH v6 03/12] hmp: Set cur_mon only in handle_hmp_command(), Kevin Wolf, 2020/05/28
- [PATCH v6 01/12] monitor: Add Monitor parameter to monitor_set_cpu(), Kevin Wolf, 2020/05/28
- [PATCH v6 05/12] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/05/28
- [PATCH v6 06/12] monitor: Make current monitor a per-coroutine property, Kevin Wolf, 2020/05/28
- [PATCH v6 04/12] qmp: Assert that no other monitor is active,
Kevin Wolf <=
- [PATCH v6 07/12] qapi: Add a 'coroutine' flag for commands, Kevin Wolf, 2020/05/28
- [PATCH v6 08/12] qmp: Move dispatcher to a coroutine, Kevin Wolf, 2020/05/28
- [PATCH v6 09/12] hmp: Add support for coroutine command handlers, Kevin Wolf, 2020/05/28
- [PATCH v6 10/12] util/async: Add aio_co_reschedule_self(), Kevin Wolf, 2020/05/28
- [PATCH v6 11/12] block: Add bdrv_co_move_to_aio_context(), Kevin Wolf, 2020/05/28
- [PATCH v6 12/12] block: Convert 'block_resize' to coroutine, Kevin Wolf, 2020/05/28