[PATCH 15/48] hw/i386: convert machines to use AliasedClass interface

["Daniel P. Berrangé" <berrange@redhat.com>]

Stop setting 'alias' in the MachineClass and instead set
'aliases' in the AliasedClass.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 hw/i386/pc_piix.c | 20 ++++++++++++++++++--
 hw/i386/pc_q35.c  | 12 +++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 88356bf0d77..8498dbeda81 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -66,6 +66,7 @@
 #include "hw/uefi/var-service-api.h"
 #include "hw/i386/acpi-build.h"
 #include "target/i386/cpu.h"
+#include "qom/object_interfaces.h"
 
 #define XEN_IOAPIC_NUM_PIRQS 128ULL
 
@@ -362,13 +363,23 @@ static void pc_i440fx_init(MachineState *machine)
     pc_init1(machine, TYPE_I440FX_PCI_DEVICE);
 }
 
+#define DEFINE_I440FX_MACHINE_ALIASES_LATEST(...) \
+    AliasedClass *alc = ALIASED_CLASS(oc); \
+    static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \
+    { \
+        MACHINE_TYPE_NAME("pc"), \
+        NULL, \
+    }; \
+    alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)
+
 #define DEFINE_I440FX_MACHINE(major, minor) \
     DEFINE_PC_VER_MACHINE(pc_i440fx, "pc-i440fx", pc_i440fx_init, \
                           {}, major, minor);
 
 #define DEFINE_I440FX_MACHINE_AS_LATEST(major, minor) \
     DEFINE_PC_VER_MACHINE(pc_i440fx, "pc-i440fx", pc_i440fx_init, { \
-            mc->is_default = true; mc->alias = "pc"; \
+            DEFINE_I440FX_MACHINE_ALIASES_LATEST(major, minor); \
+            mc->is_default = true; \
         }, major, minor);
 
 static void pc_i440fx_machine_options(MachineClass *m)
@@ -637,9 +648,14 @@ DEFINE_I440FX_MACHINE(4, 1);
 #ifdef CONFIG_XEN
 static void xenfv_machine_4_2_options(MachineClass *m)
 {
+    AliasedClass *alc = ALIASED_CLASS(m);
+    static const char *const aliases[] = {
+        MACHINE_TYPE_NAME("xenfv"), NULL,
+    };
+
     pc_i440fx_machine_4_2_options(m);
     m->desc = "Xen Fully-virtualized PC";
-    m->alias = "xenfv";
+    alc->aliases = aliases;
     m->max_cpus = HVM_MAX_VCPUS;
     m->default_machine_opts = "accel=xen,suppress-vmdesc=on";
 }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 9c6459b934d..37fbb58ef39 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -63,6 +63,7 @@
 #include "hw/uefi/var-service-api.h"
 #include "hw/i386/acpi-build.h"
 #include "target/i386/cpu.h"
+#include "qom/object_interfaces.h"
 
 /* ICH9 AHCI has 6 ports */
 #define MAX_SATA_PORTS     6
@@ -338,13 +339,22 @@ static void pc_q35_machine_set_wdat(Object *o, bool value, Error **errp)
     pcms->wdat_enabled = value;
 }
 
+#define DEFINE_Q35_MACHINE_ALIASES_LATEST(...) \
+    AliasedClass *alc = ALIASED_CLASS(oc); \
+    static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \
+    { \
+        MACHINE_TYPE_NAME("q35"), \
+        NULL, \
+    }; \
+    alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)
+
 #define DEFINE_Q35_MACHINE(major, minor) \
     DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, {}, \
                           major, minor);
 
 #define DEFINE_Q35_MACHINE_AS_LATEST(major, minor) \
     DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, { \
-            mc->alias = "q35"; \
+            DEFINE_Q35_MACHINE_ALIASES_LATEST(major, minor); \
         }, major, minor);
 
 #define DEFINE_Q35_MACHINE_BUGFIX(major, minor, micro) \
-- 
2.56.1