Stop setting 'alias' in the MachineClass and instead set 'aliases' in the AliasedClass.
Signed-off-by: Daniel P. Berrangé <[email protected]> --- hw/m68k/virt.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 2418bd3d503..487d9bcc8d0 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -36,6 +36,7 @@ #include "hw/intc/goldfish_pic.h" #include "hw/virtio/virtio-mmio.h" #include "hw/virtio/virtio-blk.h" +#include "qom/object_interfaces.h" /* * 6 goldfish-pic for CPU IRQ #1 to IRQ #6 @@ -362,10 +363,19 @@ type_init(virt_machine_register_types) } \ type_init(MACHINE_VER_SYM(register, virt, __VA_ARGS__)); +#define DEFINE_VIRT_MACHINE_ALIASES_LATEST(...) \ + AliasedClass *alc = ALIASED_CLASS(oc); \ + static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \ + { \ + MACHINE_TYPE_NAME("virt"), \ + NULL, \ + }; \ + alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__) + #define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \ DEFINE_VIRT_MACHINE_IMPL({ \ - mc->alias = "virt"; \ - }, major, minor) + DEFINE_VIRT_MACHINE_ALIASES_LATEST(major, minor); \ + }, major, minor) #define DEFINE_VIRT_MACHINE(major, minor) \ DEFINE_VIRT_MACHINE_IMPL({}, major, minor) -- 2.56.1
