diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-10-05 17:58:45 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-10-09 07:08:19 +0200 |
| commit | ff04108a0e36e822519c517bd3bddbc1c7747c18 (patch) | |
| tree | e16a9ae3f968dc638f449bacae35ab153c88a7cb /monitor/misc.c | |
| parent | 947e47448dcc4e4d7a8b7c42b43acb3435b3ad35 (diff) | |
| download | focaccia-qemu-ff04108a0e36e822519c517bd3bddbc1c7747c18.tar.gz focaccia-qemu-ff04108a0e36e822519c517bd3bddbc1c7747c18.zip | |
hmp: Update current monitor only in handle_hmp_command()
The current monitor is updated relatively early in the command handling code even though only the command handler actually needs it. The current monitor will become coroutine-local later, so we can only update it when we know in which coroutine the command will be exectued. Move it to handle_hmp_command() where this information will be available. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20201005155855.256490-5-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/misc.c')
| -rw-r--r-- | monitor/misc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/monitor/misc.c b/monitor/misc.c index ee8db45094..4a859fb24a 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -120,17 +120,13 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index, int64_t cpu_index, Error **errp) { char *output = NULL; - Monitor *old_mon; MonitorHMP hmp = {}; monitor_data_init(&hmp.common, false, true, false); - old_mon = monitor_set_cur(&hmp.common); - if (has_cpu_index) { int ret = monitor_set_cpu(&hmp.common, cpu_index); if (ret < 0) { - monitor_set_cur(old_mon); error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); goto out; @@ -138,7 +134,6 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index, } handle_hmp_command(&hmp, command_line); - monitor_set_cur(old_mon); WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) { if (qstring_get_length(hmp.common.outbuf) > 0) { |