From nobody Mon Jun 3 10:35:14 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1554446654948985.8388153815614; Thu, 4 Apr 2019 23:44:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:36975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIZv-0004Wl-7b for importer@patchew.org; Fri, 05 Apr 2019 02:43:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIY4-0003cb-Oy for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCIY3-0004PH-QV for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:00 -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 1hCIY3-0004O6-Eb for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:41:59 -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:41:57 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga007.jf.intel.com with ESMTP; 04 Apr 2019 23:41:56 -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="128814018" From: Wei Yang To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2019 14:41:18 +0800 Message-Id: <20190405064121.23662-2-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 1/4] vl.c: make find_default_machine() local 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, Wei Yang , 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" Function find_default_machine() is introduced by commit 2c8cffa599b7 "vl: make find_default_machine externally visible", and it was used outside of vl.c until commit a904410af5f1 "pc_sysfw: remove the rom_only property". Commit a904410af5f1 "pc_sysfw: remove the rom_only property" removed the only user of find_default_machine() outside vl.c, but neglected to make it static. Do that now. Signed-off-by: Wei Yang Reviewed-by: Markus Armbruster --- v2: * refactor changelog as suggested by Markus * move one not related change to patch 2 --- include/hw/boards.h | 1 - vl.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 21212f0859..e911d56c28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -57,7 +57,6 @@ void memory_region_allocate_system_memory(MemoryRegion *m= r, Object *owner, #define MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) =20 -MachineClass *find_default_machine(void); extern MachineState *current_machine; =20 void machine_run_board_init(MachineState *machine); diff --git a/vl.c b/vl.c index 502857a176..8a874e81a3 100644 --- a/vl.c +++ b/vl.c @@ -1441,7 +1441,7 @@ static MachineClass *find_machine(const char *name) return mc; } =20 -MachineClass *find_default_machine(void) +static MachineClass *find_default_machine(void) { GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false); MachineClass *mc =3D NULL; --=20 2.19.1 From nobody Mon Jun 3 10:35:14 2024 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 1554446769537632.7934170554889; Thu, 4 Apr 2019 23:46:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:37025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIbx-0006HW-Bv for importer@patchew.org; Fri, 05 Apr 2019 02:46:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIY5-0003co-Kv for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCIY4-0004Ph-H5 for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:01 -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 1hCIY4-0004O6-7x for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:00 -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:41:59 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga007.jf.intel.com with ESMTP; 04 Apr 2019 23:41:58 -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="128814022" From: Wei Yang To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2019 14:41:19 +0800 Message-Id: <20190405064121.23662-3-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 2/4] vl.c: allocate TYPE_MACHINE list once during bootup 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, Wei Yang , 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" Now all the functions used to select machine is local and the call flow looks like below: select_machine() find_default_machine() machine_parse() find_machine() All these related function will need a GSList for TYPE_MACHINE. Currently we allocate this list each time we use it, while this is not necessary to do so because we don't need to modify this. This patch make the TYPE_MACHINE list allocation in select_machine and pass this to its child for use. Signed-off-by: Wei Yang Reviewed-by: Markus Armbruster --- vl.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/vl.c b/vl.c index 8a874e81a3..cf08d96ce4 100644 --- a/vl.c +++ b/vl.c @@ -1418,9 +1418,9 @@ static int usb_parse(const char *cmdline) =20 MachineState *current_machine; =20 -static MachineClass *find_machine(const char *name) +static MachineClass *find_machine(const char *name, GSList *machines) { - GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false); + GSList *el; MachineClass *mc =3D NULL; =20 for (el =3D machines; el; el =3D el->next) { @@ -1437,13 +1437,12 @@ static MachineClass *find_machine(const char *name) } } =20 - g_slist_free(machines); return mc; } =20 -static MachineClass *find_default_machine(void) +static MachineClass *find_default_machine(GSList *machines) { - GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false); + GSList *el; MachineClass *mc =3D NULL; =20 for (el =3D machines; el; el =3D el->next) { @@ -1455,7 +1454,6 @@ static MachineClass *find_default_machine(void) } } =20 - g_slist_free(machines); return mc; } =20 @@ -2538,16 +2536,15 @@ static gint machine_class_cmp(gconstpointer a, gcon= stpointer b) object_class_get_name(OBJECT_CLASS(mc1))); } =20 - static MachineClass *machine_parse(const char *name) +static MachineClass *machine_parse(const char *name, GSList *machines) { MachineClass *mc =3D NULL; - GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false); + GSList *el; =20 if (name) { - mc =3D find_machine(name); + mc =3D find_machine(name, machines); } if (mc) { - g_slist_free(machines); return mc; } if (name && !is_help_option(name)) { @@ -2567,7 +2564,6 @@ static gint machine_class_cmp(gconstpointer a, gconst= pointer b) } } =20 - g_slist_free(machines); exit(!name || !is_help_option(name)); } =20 @@ -2659,7 +2655,8 @@ static const QEMUOption *lookup_opt(int argc, char **= argv, =20 static MachineClass *select_machine(void) { - MachineClass *machine_class =3D find_default_machine(); + GSList *machines =3D object_class_get_list(TYPE_MACHINE, false); + MachineClass *machine_class =3D find_default_machine(machines); const char *optarg; QemuOpts *opts; Location loc; @@ -2671,7 +2668,7 @@ static MachineClass *select_machine(void) =20 optarg =3D qemu_opt_get(opts, "type"); if (optarg) { - machine_class =3D machine_parse(optarg); + machine_class =3D machine_parse(optarg, machines); } =20 if (!machine_class) { @@ -2681,6 +2678,7 @@ static MachineClass *select_machine(void) } =20 loc_pop(&loc); + g_slist_free(machines); return machine_class; } =20 --=20 2.19.1 From nobody Mon Jun 3 10:35:14 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1554446655012147.53583635921166; Thu, 4 Apr 2019 23:44:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:36977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIZx-0004Zv-IX for importer@patchew.org; Fri, 05 Apr 2019 02:43:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIY7-0003dr-84 for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCIY6-0004VL-DW for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:03 -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 1hCIY6-0004O6-2b for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:02 -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:01 -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:00 -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="128814028" From: Wei Yang To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2019 14:41:20 +0800 Message-Id: <20190405064121.23662-4-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 3/4] vl: Clean up after previous commit 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 Since the previous commit, find_machine() and find_default_machine() don't have to deallocate on return. This permits further simplifications. Signed-off-by: Markus Armbruster Reviewed-by: Wei Yang --- vl.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/vl.c b/vl.c index cf08d96ce4..99f9cb2533 100644 --- a/vl.c +++ b/vl.c @@ -1421,40 +1421,31 @@ MachineState *current_machine; static MachineClass *find_machine(const char *name, GSList *machines) { GSList *el; - MachineClass *mc =3D NULL; =20 for (el =3D machines; el; el =3D el->next) { - MachineClass *temp =3D el->data; + MachineClass *mc =3D el->data; =20 - if (!strcmp(temp->name, name)) { - mc =3D temp; - break; - } - if (temp->alias && - !strcmp(temp->alias, name)) { - mc =3D temp; - break; + if (!strcmp(mc->name, name) || !g_strcmp0(mc->alias, name)) { + return mc; } } =20 - return mc; + return NULL; } =20 static MachineClass *find_default_machine(GSList *machines) { GSList *el; - MachineClass *mc =3D NULL; =20 for (el =3D machines; el; el =3D el->next) { - MachineClass *temp =3D el->data; + MachineClass *mc =3D el->data; =20 - if (temp->is_default) { - mc =3D temp; - break; + if (mc->is_default) { + return mc; } } =20 - return mc; + return NULL; } =20 MachineInfoList *qmp_query_machines(Error **errp) --=20 2.19.1 From nobody Mon Jun 3 10:35:14 2024 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