[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] vl.c: allocate TYPE_MACHINE list once during b
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 03/11] vl.c: allocate TYPE_MACHINE list once during bootup |
Date: |
Thu, 25 Apr 2019 14:56:51 -0300 |
From: Wei Yang <address@hidden>
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
vl.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/vl.c b/vl.c
index c237c9a0ac..fb8c8eda2a 100644
--- a/vl.c
+++ b/vl.c
@@ -1465,9 +1465,9 @@ static int usb_parse(const char *cmdline)
MachineState *current_machine;
-static MachineClass *find_machine(const char *name)
+static MachineClass *find_machine(const char *name, GSList *machines)
{
- GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
+ GSList *el;
MachineClass *mc = NULL;
for (el = machines; el; el = el->next) {
@@ -1484,13 +1484,12 @@ static MachineClass *find_machine(const char *name)
}
}
- g_slist_free(machines);
return mc;
}
-static MachineClass *find_default_machine(void)
+static MachineClass *find_default_machine(GSList *machines)
{
- GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
+ GSList *el;
MachineClass *mc = NULL;
for (el = machines; el; el = el->next) {
@@ -1502,7 +1501,6 @@ static MachineClass *find_default_machine(void)
}
}
- g_slist_free(machines);
return mc;
}
@@ -2585,16 +2583,15 @@ static gint machine_class_cmp(gconstpointer a,
gconstpointer b)
object_class_get_name(OBJECT_CLASS(mc1)));
}
- static MachineClass *machine_parse(const char *name)
+static MachineClass *machine_parse(const char *name, GSList *machines)
{
MachineClass *mc = NULL;
- GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
+ GSList *el;
if (name) {
- mc = find_machine(name);
+ mc = find_machine(name, machines);
}
if (mc) {
- g_slist_free(machines);
return mc;
}
if (name && !is_help_option(name)) {
@@ -2614,7 +2611,6 @@ static gint machine_class_cmp(gconstpointer a,
gconstpointer b)
}
}
- g_slist_free(machines);
exit(!name || !is_help_option(name));
}
@@ -2706,7 +2702,8 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
static MachineClass *select_machine(void)
{
- MachineClass *machine_class = find_default_machine();
+ GSList *machines = object_class_get_list(TYPE_MACHINE, false);
+ MachineClass *machine_class = find_default_machine(machines);
const char *optarg;
QemuOpts *opts;
Location loc;
@@ -2718,7 +2715,7 @@ static MachineClass *select_machine(void)
optarg = qemu_opt_get(opts, "type");
if (optarg) {
- machine_class = machine_parse(optarg);
+ machine_class = machine_parse(optarg, machines);
}
if (!machine_class) {
@@ -2728,6 +2725,7 @@ static MachineClass *select_machine(void)
}
loc_pop(&loc);
+ g_slist_free(machines);
return machine_class;
}
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/11] Machine queue, 2019-04-25, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 01/11] hw: add compat machines for 4.1, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 02/11] vl.c: make find_default_machine() local, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 03/11] vl.c: allocate TYPE_MACHINE list once during bootup,
Eduardo Habkost <=
- [Qemu-devel] [PULL 04/11] vl: Clean up after previous commit, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 05/11] vl: Simplify machine_parse(), Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 06/11] cpu: Rename parse_cpu_model() to parse_cpu_option(), Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 07/11] cpu: Fix crash with empty -cpu option, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 08/11] util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 09/11] scripts/update-linux-headers: add linux/mman.h, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 10/11] linux-headers: add linux/mman.h., Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 11/11] util/mmap-alloc: support MAP_SYNC in qemu_ram_mmap(), Eduardo Habkost, 2019/04/25
- Re: [Qemu-devel] [PULL 00/11] Machine queue, 2019-04-25, Peter Maydell, 2019/04/26