Set the parent and versioned QOM types to m68k-virt so M68K virt no longer collides with other virt-machine types in one process. Keep the -M / help / migration name as virt-* via machine_class_set_name().
Signed-off-by: Yonggang Luo <[email protected]> --- hw/m68k/virt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 274970978ff..1faa178bdfc 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -323,7 +323,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) } static const TypeInfo virt_machine_info = { - .name = MACHINE_TYPE_NAME("virt"), + .name = MACHINE_TYPE_NAME("m68k-virt"), .parent = TYPE_MACHINE, .abstract = true, .class_init = virt_machine_class_init, @@ -345,14 +345,15 @@ type_init(virt_machine_register_types) MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ mc->desc = "QEMU " MACHINE_VER_STR(__VA_ARGS__) " M68K Virtual Machine"; \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + machine_class_set_name(mc, "virt-" MACHINE_VER_STR(__VA_ARGS__)); \ if (latest) { \ mc->alias = "virt"; \ } \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = \ { \ - .name = MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ - .parent = MACHINE_TYPE_NAME("virt"), \ + .name = MACHINE_VER_TYPE_NAME("m68k-virt", __VA_ARGS__), \ + .parent = MACHINE_TYPE_NAME("m68k-virt"), \ .class_init = MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ }; \ static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ -- 2.52.0.windows.1
