diff options
Diffstat (limited to 'monitor/hmp.c')
| -rw-r--r-- | monitor/hmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/monitor/hmp.c b/monitor/hmp.c index e0cc9e65dd..560ec98e7b 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1061,6 +1061,7 @@ void handle_hmp_command(MonitorHMP *mon, const char *cmdline) QDict *qdict; const HMPCommand *cmd; const char *cmd_start = cmdline; + Monitor *old_mon; trace_handle_hmp_command(mon, cmdline); @@ -1079,7 +1080,11 @@ void handle_hmp_command(MonitorHMP *mon, const char *cmdline) return; } + /* old_mon is non-NULL when called from qmp_human_monitor_command() */ + old_mon = monitor_set_cur(&mon->common); cmd->cmd(&mon->common, qdict); + monitor_set_cur(old_mon); + qobject_unref(qdict); } @@ -1301,11 +1306,8 @@ cleanup: static void monitor_read(void *opaque, const uint8_t *buf, int size) { MonitorHMP *mon = container_of(opaque, MonitorHMP, common); - Monitor *old_mon; int i; - old_mon = monitor_set_cur(&mon->common); - if (mon->rs) { for (i = 0; i < size; i++) { readline_handle_byte(mon->rs, buf[i]); @@ -1317,8 +1319,6 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size) handle_hmp_command(mon, (char *)buf); } } - - monitor_set_cur(old_mon); } static void monitor_event(void *opaque, QEMUChrEvent event) |