We drop the target_machine_typename() we introduced previously, and revert to using TYPE_MACHINE. From there, we'll make sure only the right types are registered at startup time.
Signed-off-by: Pierrick Bouvier <[email protected]> --- hw/core/machine-qmp-cmds.c | 2 +- monitor/qemu-config-qmp.c | 2 +- system/vl.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 1aa5f262298..543dd3201b5 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -99,7 +99,7 @@ MachineInfoList *qmp_query_machines(bool has_compat_props, bool compat_props, GSList *el, *machines; MachineInfoList *mach_list = NULL; - machines = object_class_get_list(target_machine_typename(), false); + machines = object_class_get_list(TYPE_MACHINE, false); for (el = machines; el; el = el->next) { MachineClass *mc = el->data; const char *default_cpu_type = machine_class_default_cpu_type(mc); diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c index 29801023564..a680c9feca5 100644 --- a/monitor/qemu-config-qmp.c +++ b/monitor/qemu-config-qmp.c @@ -129,7 +129,7 @@ static CommandLineParameterInfoList *query_all_machine_properties(void) ObjectProperty *prop; bool is_new; - machines = object_class_get_list(target_machine_typename(), false); + machines = object_class_get_list(TYPE_MACHINE, false); assert(machines); /* Loop over all machine classes */ diff --git a/system/vl.c b/system/vl.c index 061cbdf860b..f7f8aabd122 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1570,7 +1570,7 @@ static void machine_help_func(const QDict *qdict) GSList *el; const char *type = qdict_get_try_str(qdict, "type"); - machines = object_class_get_list(target_machine_typename(), false); + machines = object_class_get_list(TYPE_MACHINE, false); if (type) { ObjectClass *machine_class = OBJECT_CLASS(find_machine(type, machines)); if (machine_class) { @@ -1682,8 +1682,7 @@ static MachineClass *select_machine(QDict *qdict, Error **errp) { ERRP_GUARD(); const char *machine_type = qdict_get_try_str(qdict, "type"); - g_autoptr(GSList) machines = object_class_get_list(target_machine_typename(), - false); + g_autoptr(GSList) machines = object_class_get_list(TYPE_MACHINE, false); MachineClass *machine_class = NULL; if (machine_type) { -- 2.43.0
