summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-03-06 19:49:41 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-06-02 10:07:15 +0200
commit6a50636f35ba677c747f2f6127b0dba994b039ca (patch)
treefe4412236eb2d9a4e75775ef3fc0634148acc57e
parent74358f2a1647b239d87340ea0024f9d2efa266ca (diff)
downloadfocaccia-qemu-6a50636f35ba677c747f2f6127b0dba994b039ca.tar.gz
focaccia-qemu-6a50636f35ba677c747f2f6127b0dba994b039ca.zip
monitor: Drop do_qmp_capabilities()'s superfluous QMP check
Superfluous since commit 30f5041 removed it from HMP.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r--monitor.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/monitor.c b/monitor.c
index f20e918fe4..daba98f372 100644
--- a/monitor.c
+++ b/monitor.c
@@ -566,11 +566,7 @@ static void monitor_qapi_event_init(void)
 static int do_qmp_capabilities(Monitor *mon, const QDict *params,
                                QObject **ret_data)
 {
-    /* Will setup QMP capabilities in the future */
-    if (monitor_ctrl_mode(mon)) {
-        mon->qmp.command_mode = 1;
-    }
-
+    mon->qmp.command_mode = 1;
     return 0;
 }