summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-08-23 13:49:02 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-23 20:19:59 -0500
commit26efaca377e004b79ff50a6e936d029a0c095b8b (patch)
tree7222ebd6d75e1cc733d2e38c8a7837ef680fec93
parent6fc97fafce05eee76479ca6d289241772d21b370 (diff)
downloadfocaccia-qemu-26efaca377e004b79ff50a6e936d029a0c095b8b.tar.gz
focaccia-qemu-26efaca377e004b79ff50a6e936d029a0c095b8b.zip
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>
-rw-r--r--monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index b188582057..b17b1bb849 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4946,13 +4946,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;