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

login
register
mail settings
Submitter Anthony Liguori
Date Aug. 23, 2012, 6:49 p.m.
Message ID <1345747791-8506-1-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/179705/
State New
Headers show

Comments

Anthony Liguori - Aug. 23, 2012, 6:49 p.m.
Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 monitor.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/monitor.c b/monitor.c
index b188582..b17b1bb 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;