]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
monitor: don't try to initialize json parser when monitor is HMP
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 23 Aug 2012 18:49:02 +0000 (13:49 -0500)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 28 Aug 2012 06:50:02 +0000 (01:50 -0500)
Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 26efaca377e004b79ff50a6e936d029a0c095b8b)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
monitor.c

index ab65a9aab3efb0b2669cc1405723f6e5fbcfcce7..a7af002edb359847c3590906f22e427c4e46796f 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -4605,13 +4605,13 @@ void monitor_init(CharDriverState *chr, int flags)
         qemu_chr_add_handlers(chr, monitor_can_read, monitor_control_read,
                               monitor_control_event, mon);
         qemu_chr_fe_set_echo(chr, true);
+
+        json_message_parser_init(&mon->mc->parser, handle_qmp_command);
     } else {
         qemu_chr_add_handlers(chr, monitor_can_read, monitor_read,
                               monitor_event, mon);
     }
 
-    json_message_parser_init(&mon->mc->parser, handle_qmp_command);
-
     QLIST_INSERT_HEAD(&mon_list, mon, entry);
     if (!default_mon || (flags & MONITOR_IS_DEFAULT))
         default_mon = mon;