From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, marcandre.lureau@gmail.com, armbru@redhat.com,
stefanha@redhat.com, qemu-devel@nongnu.org
Subject: [PATCH v8 05/14] qmp: Assert that no other monitor is active
Date: Mon, 5 Oct 2020 17:58:46 +0200 [thread overview]
Message-ID: <20201005155855.256490-6-kwolf@redhat.com> (raw)
In-Reply-To: <20201005155855.256490-1-kwolf@redhat.com>
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
next prev parent reply other threads:[~2020-10-05 16:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 15:58 [PATCH v8 00/14] monitor: Optionally run handlers in coroutines Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 01/14] monitor: Add Monitor parameter to monitor_set_cpu() Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 02/14] monitor: Add Monitor parameter to monitor_get_cpu_index() Kevin Wolf
2020-10-05 16:34 ` Eric Blake
2020-10-05 15:58 ` [PATCH v8 03/14] monitor: Use getter/setter functions for cur_mon Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 04/14] hmp: Update current monitor only in handle_hmp_command() Kevin Wolf
2020-10-05 15:58 ` Kevin Wolf [this message]
2020-10-05 15:58 ` [PATCH v8 06/14] qmp: Call monitor_set_cur() only in qmp_dispatch() Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 07/14] monitor: Make current monitor a per-coroutine property Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 08/14] qapi: Add a 'coroutine' flag for commands Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 09/14] qmp: Move dispatcher to a coroutine Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 10/14] hmp: Add support for coroutine command handlers Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 11/14] util/async: Add aio_co_reschedule_self() Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 12/14] block: Add bdrv_co_enter()/leave() Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 13/14] block: Add bdrv_lock()/unlock() Kevin Wolf
2020-10-05 15:58 ` [PATCH v8 14/14] block: Convert 'block_resize' to coroutine Kevin Wolf
2020-10-06 6:29 ` [PATCH v8 00/14] monitor: Optionally run handlers in coroutines Markus Armbruster
2020-10-08 15:53 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201005155855.256490-6-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).