[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 05/13] qmp: Assert that no other monitor is active
From: |
Kevin Wolf |
Subject: |
[PATCH v7 05/13] qmp: Assert that no other monitor is active |
Date: |
Wed, 9 Sep 2020 17:11:41 +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, 4 insertions(+), 1 deletion(-)
diff --git a/monitor/qmp.c b/monitor/qmp.c
index bb2d9d0cc7..8469970c69 100644
--- a/monitor/qmp.c
+++ b/monitor/qmp.c
@@ -140,8 +140,11 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject
*req)
QDict *error;
old_mon = monitor_set_cur(&mon->common);
+ assert(old_mon == NULL);
+
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
- [PATCH v7 00/13] monitor: Optionally run handlers in coroutines, Kevin Wolf, 2020/09/09
- [PATCH v7 01/13] monitor: Add Monitor parameter to monitor_set_cpu(), Kevin Wolf, 2020/09/09
- [PATCH v7 02/13] monitor: Add Monitor parameter to monitor_get_cpu_index(), Kevin Wolf, 2020/09/09
- [PATCH v7 03/13] monitor: Use getter/setter functions for cur_mon, Kevin Wolf, 2020/09/09
- [PATCH v7 04/13] hmp: Update current monitor only in handle_hmp_command(), Kevin Wolf, 2020/09/09
- [PATCH v7 05/13] qmp: Assert that no other monitor is active,
Kevin Wolf <=
- [PATCH v7 07/13] monitor: Make current monitor a per-coroutine property, Kevin Wolf, 2020/09/09
[PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/09/09