From: Jason Andryuk <jandryuk@gmail.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
Jason Andryuk <jandryuk@gmail.com>
Subject: [PATCH] qmp: Reset mon->commands on CHR_EVENT_CLOSED
Date: Wed, 6 Nov 2019 08:03:09 -0500 [thread overview]
Message-ID: <20191106130309.6737-1-jandryuk@gmail.com> (raw)
Currently, mon->commands is uninitialized until CHR_EVENT_OPENED where
it is set to &qmp_cap_negotiation_commands. After capability
negotiation, it is set to &qmp_commands. If the chardev is closed,
CHR_EVENT_CLOSED, mon->commands remains as &qmp_commands. Only once the
chardev is re-opened with CHR_EVENT_OPENED, is it reset to
&qmp_cap_negotiation_commands.
monitor_qapi_event_emit compares mon->commands to
&qmp_cap_negotiation_commands, and skips sending events when they are
equal. In the case of a closed chardev, QMP events are still sent down
to the closed chardev which needs to drop them.
Set mon->commands to &qmp_cap_negotiation_commands for CHR_EVENT_CLOSED
to stop sending events. Setting for the CHR_EVENT_OPENED case remains
since that is how mon->commands is set for a newly opened connections.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
monitor/qmp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/monitor/qmp.c b/monitor/qmp.c
index 9d9e5d8b27..5e2073c5eb 100644
--- a/monitor/qmp.c
+++ b/monitor/qmp.c
@@ -333,6 +333,7 @@ static void monitor_qmp_event(void *opaque, int event)
* is closed.
*/
monitor_qmp_cleanup_queues(mon);
+ mon->commands = &qmp_cap_negotiation_commands;
json_message_parser_destroy(&mon->parser);
json_message_parser_init(&mon->parser, handle_qmp_command,
mon, NULL);
--
2.21.0
next reply other threads:[~2019-11-06 13:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 13:03 Jason Andryuk [this message]
2019-11-06 14:52 ` [PATCH] qmp: Reset mon->commands on CHR_EVENT_CLOSED Marc-André Lureau
2019-11-06 15:10 ` Jason Andryuk
2019-11-07 1:08 ` no-reply
2019-11-07 16:08 ` Jason Andryuk
2019-11-13 12:40 ` Markus Armbruster
2019-11-13 13:18 ` Marc-André Lureau
2019-11-13 13:37 ` Jason Andryuk
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=20191106130309.6737-1-jandryuk@gmail.com \
--to=jandryuk@gmail.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).