From nobody Sun Nov 9 21:35:21 2025 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552285301749776.4200988673151; Sun, 10 Mar 2019 23:21:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:56040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3EJR-0004iL-4Y for importer@patchew.org; Mon, 11 Mar 2019 02:21:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3EI1-0003xp-Fv for qemu-devel@nongnu.org; Mon, 11 Mar 2019 02:19:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3E7N-0005NU-6D for qemu-devel@nongnu.org; Mon, 11 Mar 2019 02:08:57 -0400 Received: from mga17.intel.com ([192.55.52.151]:64405) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3E7M-0005Mj-T1 for qemu-devel@nongnu.org; Mon, 11 Mar 2019 02:08:57 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Mar 2019 23:08:54 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga003.jf.intel.com with ESMTP; 10 Mar 2019 23:08:53 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,467,1544515200"; d="scan'208";a="132998875" From: Wei Yang To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 14:08:22 +0800 Message-Id: <20190311060823.18360-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190311060823.18360-1-richardw.yang@linux.intel.com> References: <20190311060823.18360-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: 192.55.52.151 Subject: [Qemu-devel] [PATCH 1/2] 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, ehabkost@redhat.com, Wei Yang 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", while it seems no one outside use it. This patch make it local again. Signed-off-by: Wei Yang --- include/hw/boards.h | 1 - vl.c | 4 ++-- 2 files changed, 2 insertions(+), 3 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..3688e2bc98 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; @@ -2538,7 +2538,7 @@ static gint machine_class_cmp(gconstpointer a, gconst= pointer b) object_class_get_name(OBJECT_CLASS(mc1))); } =20 - static MachineClass *machine_parse(const char *name) +static MachineClass *machine_parse(const char *name) { MachineClass *mc =3D NULL; GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false); --=20 2.19.1 From nobody Sun Nov 9 21:35:21 2025 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552285301803695.686910633002; Sun, 10 Mar 2019 23:21:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:56038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3EJQ-0004ho-Sv for importer@patchew.org; Mon, 11 Mar 2019 02:21:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3EI1-0003ss-Bl for qemu-devel@nongnu.org; Mon, 11 Mar 2019 02:19:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3E7N-0005Ne-Nu for qemu-devel@nongnu.org; Mon, 11 Mar 2019 02:08:58 -0400 Received: from mga17.intel.com ([192.55.52.151]:64405) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3E7N-0005Mj-Db for qemu-devel@nongnu.org; Mon, 11 Mar 2019 02:08:57 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Mar 2019 23:08:56 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga003.jf.intel.com with ESMTP; 10 Mar 2019 23:08:55 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,467,1544515200"; d="scan'208";a="132998878" From: Wei Yang To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 14:08:23 +0800 Message-Id: <20190311060823.18360-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190311060823.18360-1-richardw.yang@linux.intel.com> References: <20190311060823.18360-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: 192.55.52.151 Subject: [Qemu-devel] [PATCH 2/2] 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, ehabkost@redhat.com, Wei Yang 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 3688e2bc98..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 MachineClass *machine_parse(const char *name) } } =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 Sun Nov 9 21:35:21 2025 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554211712971712.319475197408; Tue, 2 Apr 2019 06:28:32 -0700 (PDT) Received: from localhost ([127.0.0.1]:58042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBJSX-0004Cv-K5 for importer@patchew.org; Tue, 02 Apr 2019 09:28:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBJRH-0002yz-Jz 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-0003Yq-F9 for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10123) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hBJRG-0003YA-6L for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B36088AA2; 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 1740A1001DDB; Tue, 2 Apr 2019 13:26:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 928271138648; Tue, 2 Apr 2019 15:26:50 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2019 15:26:49 +0200 Message-Id: <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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); 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 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, richardw.yang@linux.intel.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- vl.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/vl.c b/vl.c index 126081f595..6a31e5bfac 100644 --- a/vl.c +++ b/vl.c @@ -1467,40 +1467,29 @@ 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; - - if (temp->is_default) { - mc =3D temp; - break; + if (((MachineClass *)el->data)->is_default) { + return el->data; } } =20 - return mc; + return NULL; } =20 MachineInfoList *qmp_query_machines(Error **errp) --=20 2.17.2