From nobody Sun Feb 8 14:52:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554446771113579.1333439347703; Thu, 4 Apr 2019 23:46:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:37027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIc4-0006Ls-6s for importer@patchew.org; Fri, 05 Apr 2019 02:46:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIY9-0003fR-1w for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCIY8-0004YY-6V for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:05 -0400 Received: from mga07.intel.com ([134.134.136.100]:40758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hCIY7-0004O6-TF for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:04 -0400 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2019 23:42:03 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga007.jf.intel.com with ESMTP; 04 Apr 2019 23:42:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,310,1549958400"; d="scan'208";a="128814036" From: Wei Yang To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2019 14:41:21 +0800 Message-Id: <20190405064121.23662-5-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190405064121.23662-1-richardw.yang@linux.intel.com> References: <20190405064121.23662-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 Subject: [Qemu-devel] [PATCH v2 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, ehabkost@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Exploit that argument @name is nerver null. Check is_help_option() first, because that's what we do elsewhere. If we (foolishly!) defined a machine named "help", -machine help would now print help instead of selecting the machine named "help". Signed-off-by: Markus Armbruster Reviewed-by: Wei Yang --- vl.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/vl.c b/vl.c index 99f9cb2533..4f4d440bc4 100644 --- a/vl.c +++ b/vl.c @@ -2529,19 +2529,10 @@ static gint machine_class_cmp(gconstpointer a, gcon= stpointer b) =20 static MachineClass *machine_parse(const char *name, GSList *machines) { - MachineClass *mc =3D NULL; + MachineClass *mc; GSList *el; =20 - if (name) { - mc =3D 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 =3D g_slist_sort(machines, machine_class_cmp); for (el =3D machines; el; el =3D el->next) { @@ -2553,9 +2544,16 @@ static MachineClass *machine_parse(const char *name,= GSList *machines) mc->is_default ? " (default)" : "", mc->deprecation_reason ? " (deprecated)" : ""); } + exit(0); } =20 - exit(!name || !is_help_option(name)); + mc =3D 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; } =20 void qemu_add_exit_notifier(Notifier *notify) --=20 2.19.1