From patchwork Fri May 29 09:56:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 477760 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 78757140E45 for ; Fri, 29 May 2015 20:03:14 +1000 (AEST) Received: from localhost ([::1]:34746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyH8B-000345-Og for incoming@patchwork.ozlabs.org; Fri, 29 May 2015 06:03:11 -0400 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) Received: from blackfin.pond.sub.org (ovpn-116-52.ams2.redhat.com [10.36.116.52]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4T9v5wX026724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 29 May 2015 05:57:06 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 154F0305AB64; Fri, 29 May 2015 11:57:01 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v3 18/21] monitor: Drop do_qmp_capabilities()'s superfluous QMP check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }