From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 6 Mar 2015 18:49:41 +0000 (+0100)
Subject: monitor: Drop do_qmp_capabilities()'s superfluous QMP check
X-Git-Tag: v2.4.0-rc0~103^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a50636f35ba677c747f2f6127b0dba994b039ca;p=thirdparty%2Fqemu.git

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>
---

diff --git a/monitor.c b/monitor.c
index f20e918fe42..daba98f372f 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;
 }