From patchwork Tue Apr 2 13:26:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 10881707 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18E6813B5 for ; Tue, 2 Apr 2019 13:36:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 017B5286AA for ; Tue, 2 Apr 2019 13:36:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E971028724; Tue, 2 Apr 2019 13:36:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9F2CA286AA for ; Tue, 2 Apr 2019 13:36:56 +0000 (UTC) Received: from localhost ([127.0.0.1]:60345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBJax-0004ON-OQ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Apr 2019 09:36:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBJRH-0002z0-K3 for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBJRG-0003Yv-FT for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hBJRG-0003YB-6x for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4AB17C0467E4; Tue, 2 Apr 2019 13:26:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-116.ams2.redhat.com [10.36.116.116]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1958060BE5; Tue, 2 Apr 2019 13:26:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 94C8A1132BB6; Tue, 2 Apr 2019 15:26:50 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2019 15:26:50 +0200 Message-Id: <20190402132650.23095-2-armbru@redhat.com> In-Reply-To: <20190402132650.23095-1-armbru@redhat.com> References: <20190402132650.23095-1-armbru@redhat.com> In-Reply-To: <20190311060823.18360-1-richardw.yang@linux.intel.com> References: <20190311060823.18360-1-richardw.yang@linux.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 02 Apr 2019 13:26:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] vl: Simplify machine_parse() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, richardw.yang@linux.intel.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Exploit that argument @name is nerver null. Check is_help_option() first, because that's what we do elsewhere. Signed-off-by: Markus Armbruster --- vl.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/vl.c b/vl.c index 6a31e5bfac..da1af3e10d 100644 --- a/vl.c +++ b/vl.c @@ -2573,19 +2573,10 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) static MachineClass *machine_parse(const char *name, GSList *machines) { - MachineClass *mc = NULL; + MachineClass *mc; GSList *el; - if (name) { - mc = find_machine(name, machines); - } - if (mc) { - return mc; - } - if (name && !is_help_option(name)) { - error_report("unsupported machine type"); - error_printf("Use -machine help to list supported machines\n"); - } else { + if (is_help_option(name)) { printf("Supported machines are:\n"); machines = g_slist_sort(machines, machine_class_cmp); for (el = machines; el; el = el->next) { @@ -2597,9 +2588,16 @@ static MachineClass *machine_parse(const char *name, GSList *machines) mc->is_default ? " (default)" : "", mc->deprecation_reason ? " (deprecated)" : ""); } + exit(0); } - - exit(!name || !is_help_option(name)); + + mc = find_machine(name, machines); + if (!mc) { + error_report("unsupported machine type"); + error_printf("Use -machine help to list supported machines\n"); + exit(1); + } + return mc; } void qemu_add_exit_notifier(Notifier *notify)