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

Signed-off-by: Daniel P. Berrangé <[email protected]>
---
 hw/ppc/pnv.c   |  7 ++++++-
 hw/ppc/spapr.c | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index f9478545ff9..a93d2953604 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -62,6 +62,7 @@
 #include "hw/char/serial-isa.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "exec/cpu-common.h"
+#include "qom/object_interfaces.h"
 
 #include <libfdt.h>
 
@@ -3472,6 +3473,10 @@ static void pnv_machine_power11_class_init(ObjectClass 
*oc, const void *data)
     PnvMachineClass *pmc = PNV_MACHINE_CLASS(oc);
     XiveFabricClass *xfc = XIVE_FABRIC_CLASS(oc);
     static const char compat[] = "qemu,powernv11\0ibm,powernv";
+    AliasedClass *alc = ALIASED_CLASS(oc);
+    static const char *const aliases[] = {
+        MACHINE_TYPE_NAME("powernv"), NULL
+    };
 
     static GlobalProperty phb_compat[] = {
         { TYPE_PNV_PHB, "version", "5" },
@@ -3493,7 +3498,7 @@ static void pnv_machine_power11_class_init(ObjectClass 
*oc, const void *data)
     mc->desc = "IBM PowerNV (Non-Virtualized) Power11";
     mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power11_v2.0");
 
-    mc->alias = "powernv";
+    alc->aliases = aliases;
 
     object_class_property_add_bool(oc, "big-core",
                                    pnv_machine_get_big_core,
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 8816f607a8f..aa14322222c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -92,6 +92,7 @@
 #include "hw/ppc/spapr_tpm_proxy.h"
 #include "hw/ppc/spapr_nvdimm.h"
 #include "hw/ppc/spapr_numa.h"
+#include "qom/object_interfaces.h"
 
 #include <libfdt.h>
 
@@ -4752,9 +4753,18 @@ static const TypeInfo spapr_machine_info = {
     }                                                                \
     type_init(MACHINE_VER_SYM(register, spapr, __VA_ARGS__))
 
-#define DEFINE_SPAPR_MACHINE_AS_LATEST(major, minor) \
+#define DEFINE_SPAPR_MACHINE_ALIASES_LATEST(...) \
+    AliasedClass *alc = ALIASED_CLASS(oc); \
+    static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \
+    { \
+        MACHINE_TYPE_NAME("pseries"), \
+        NULL, \
+    }; \
+    alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)
+
+#define DEFINE_SPAPR_MACHINE_AS_LATEST(major, minor)    \
     DEFINE_SPAPR_MACHINE_IMPL({ \
-            mc->alias = "pseries"; \
+            DEFINE_SPAPR_MACHINE_ALIASES_LATEST(major, minor);   \
             mc->is_default = true; \
         }, major, minor)
 #define DEFINE_SPAPR_MACHINE(major, minor) \
-- 
2.56.1


Reply via email to