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) {
}
}
- 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) {
}
}
- g_slist_free(machines);
return mc;
}
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)) {
}
}
- g_slist_free(machines);
exit(!name || !is_help_option(name));
}
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;
optarg = qemu_opt_get(opts, "type");
if (optarg) {
- machine_class = machine_parse(optarg);
+ machine_class = machine_parse(optarg, machines);
}
if (!machine_class) {
}
loc_pop(&loc);
+ g_slist_free(machines);
return machine_class;
}