From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxGfE-0001UI-E3 for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxGf9-0006m6-Nf for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxGf9-0006lV-G3 for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:03 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4QFL3jH015695 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 26 May 2015 11:21:03 -0400 From: Markus Armbruster Date: Tue, 26 May 2015 17:20:52 +0200 Message-Id: <1432653655-30745-18-git-send-email-armbru@redhat.com> In-Reply-To: <1432653655-30745-1-git-send-email-armbru@redhat.com> References: <1432653655-30745-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 17/20] 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 --- monitor.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index e90502f..cfbc760 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