falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitor: don't try to initialize json parser when monitor is HMP 

Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 26efaca377)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Anthony Liguori 2012-08-23 13:49:02 -05:00 committed by Michael Roth
parent cdcf2aa41c
commit 5330a894ed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monitor.c
View File

@ -4605,13 +4605,13 @@ void monitor_init(CharDriverState *chr, int flags)
qemu_chr_add_handlers(chr, monitor_can_read, monitor_control_read, qemu_chr_add_handlers(chr, monitor_can_read, monitor_control_read,
monitor_control_event, mon); monitor_control_event, mon);
qemu_chr_fe_set_echo(chr, true); qemu_chr_fe_set_echo(chr, true);
json_message_parser_init(&mon->mc->parser, handle_qmp_command);
} else { } else {
qemu_chr_add_handlers(chr, monitor_can_read, monitor_read, qemu_chr_add_handlers(chr, monitor_can_read, monitor_read,
monitor_event, mon); monitor_event, mon);
} }
json_message_parser_init(&mon->mc->parser, handle_qmp_command);
QLIST_INSERT_HEAD(&mon_list, mon, entry); QLIST_INSERT_HEAD(&mon_list, mon, entry);
if (!default_mon || (flags & MONITOR_IS_DEFAULT)) if (!default_mon || (flags & MONITOR_IS_DEFAULT))
default_mon = mon; default_mon = mon;