aboutsummaryrefslogtreecommitdiff
path: root/monitor/qmp.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2020-10-05 17:58:46 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-10-09 07:08:19 +0200
commit57d3635e42752289388b0a178fd636acbf3b90fa (patch)
treee499a0e23ae5db138ea4578ba2b2cc7a2ccee088 /monitor/qmp.c
parentff04108a0e36e822519c517bd3bddbc1c7747c18 (diff)
downloadqemu-57d3635e42752289388b0a178fd636acbf3b90fa.zip
qemu-57d3635e42752289388b0a178fd636acbf3b90fa.tar.gz
qemu-57d3635e42752289388b0a178fd636acbf3b90fa.tar.bz2
qmp: Assert that no other monitor is active
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> Message-Id: <20201005155855.256490-6-kwolf@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'monitor/qmp.c')
-rw-r--r--monitor/qmp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/monitor/qmp.c b/monitor/qmp.c
index bb2d9d0..8469970 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");