From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyH2M-00075K-SG for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyH2J-0003ee-V8 for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyH2J-0003eI-Qv for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:07 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 6916FC12D6 for ; Fri, 29 May 2015 09:57:07 +0000 (UTC) From: Markus Armbruster Date: Fri, 29 May 2015 11:56:57 +0200 Message-Id: <1432893420-18687-19-git-send-email-armbru@redhat.com> In-Reply-To: <1432893420-18687-1-git-send-email-armbru@redhat.com> References: <1432893420-18687-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 18/21] monitor: Drop do_qmp_capabilities()'s superfluous QMP check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Superfluous since commit 30f5041 removed it from HMP. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- monitor.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 187ccdb..d01d270 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; } -- 1.9.3