This introduces a globally unique QOM typename 'm68k-virt' for the virt machine type.
An alias is added to resolve existing convenience name 'virt'. Signed-off-by: Daniel P. Berrangé <[email protected]> --- hw/m68k/virt.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 487d9bcc8d0..398293144c8 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -324,7 +324,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, @@ -351,8 +351,8 @@ type_init(virt_machine_register_types) } \ 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__), \ .is_available = target_m68k, \ }; \ @@ -368,6 +368,17 @@ type_init(virt_machine_register_types) static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \ { \ MACHINE_TYPE_NAME("virt"), \ + MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ + MACHINE_TYPE_NAME("m68k-virt"), \ + NULL, \ + }; \ + alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__) + +#define DEFINE_VIRT_MACHINE_ALIASES(...) \ + AliasedClass *alc = ALIASED_CLASS(oc); \ + static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \ + { \ + MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ NULL, \ }; \ alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__) @@ -377,7 +388,9 @@ type_init(virt_machine_register_types) DEFINE_VIRT_MACHINE_ALIASES_LATEST(major, minor); \ }, major, minor) #define DEFINE_VIRT_MACHINE(major, minor) \ - DEFINE_VIRT_MACHINE_IMPL({}, major, minor) + DEFINE_VIRT_MACHINE_IMPL({ \ + DEFINE_VIRT_MACHINE_ALIASES(major, minor); \ + }, major, minor) static void virt_machine_11_2_options(MachineClass *mc) { -- 2.56.1
