hw/ppc: convert 'spapr' machine definitions to use new macros
This changes the DEFINE_SPAPR_MACHINE macro to use the common
helpers for constructing versioned symbol names and strings,
bringing greater consistency across targets.
The added benefit is that it avoids the need to repeat the
version number twice in two different formats in the calls
to DEFINE_SPAPR_MACHINE.
A DEFINE_SPAPR_MACHINE_AS_LATEST helper is added so that it
is not required to pass 'false' for every single historical
machine type.
Due to the odd-ball '2.12-sxxm' machine type version, this
commit introduces a DEFINE_SPAPR_MACHINE_TAGGED helper to
allow defining of "tagged" machine types which have a string
suffix.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240620165742.1711389-5-berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a990854..2785b6b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4804,26 +4804,35 @@
mc->is_default = true;
}
-#define DEFINE_SPAPR_MACHINE(suffix, verstr, latest) \
- static void spapr_machine_##suffix##_class_init(ObjectClass *oc, \
- void *data) \
+#define DEFINE_SPAPR_MACHINE_IMPL(latest, ...) \
+ static void MACHINE_VER_SYM(class_init, spapr, __VA_ARGS__)( \
+ ObjectClass *oc, \
+ void *data) \
{ \
MachineClass *mc = MACHINE_CLASS(oc); \
- spapr_machine_##suffix##_class_options(mc); \
+ MACHINE_VER_SYM(class_options, spapr, __VA_ARGS__)(mc); \
if (latest) { \
spapr_machine_latest_class_options(mc); \
} \
} \
- static const TypeInfo spapr_machine_##suffix##_info = { \
- .name = MACHINE_TYPE_NAME("pseries-" verstr), \
- .parent = TYPE_SPAPR_MACHINE, \
- .class_init = spapr_machine_##suffix##_class_init, \
- }; \
- static void spapr_machine_register_##suffix(void) \
+ static const TypeInfo MACHINE_VER_SYM(info, spapr, __VA_ARGS__) = \
{ \
- type_register(&spapr_machine_##suffix##_info); \
+ .name = MACHINE_VER_TYPE_NAME("pseries", __VA_ARGS__), \
+ .parent = TYPE_SPAPR_MACHINE, \
+ .class_init = MACHINE_VER_SYM(class_init, spapr, __VA_ARGS__), \
+ }; \
+ static void MACHINE_VER_SYM(register, spapr, __VA_ARGS__)(void) \
+ { \
+ type_register(&MACHINE_VER_SYM(info, spapr, __VA_ARGS__)); \
} \
- type_init(spapr_machine_register_##suffix)
+ type_init(MACHINE_VER_SYM(register, spapr, __VA_ARGS__))
+
+#define DEFINE_SPAPR_MACHINE_AS_LATEST(major, minor) \
+ DEFINE_SPAPR_MACHINE_IMPL(true, major, minor)
+#define DEFINE_SPAPR_MACHINE(major, minor) \
+ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)
+#define DEFINE_SPAPR_MACHINE_TAGGED(major, minor, tag) \
+ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, _, tag)
/*
* pseries-9.1
@@ -4833,7 +4842,7 @@
/* Defaults for the latest behaviour inherited from the base class */
}
-DEFINE_SPAPR_MACHINE(9_1, "9.1", true);
+DEFINE_SPAPR_MACHINE_AS_LATEST(9, 1);
/*
* pseries-9.0
@@ -4844,7 +4853,7 @@
compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
}
-DEFINE_SPAPR_MACHINE(9_0, "9.0", false);
+DEFINE_SPAPR_MACHINE(9, 0);
/*
* pseries-8.2
@@ -4855,7 +4864,7 @@
compat_props_add(mc->compat_props, hw_compat_8_2, hw_compat_8_2_len);
}
-DEFINE_SPAPR_MACHINE(8_2, "8.2", false);
+DEFINE_SPAPR_MACHINE(8, 2);
/*
* pseries-8.1
@@ -4866,7 +4875,7 @@
compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len);
}
-DEFINE_SPAPR_MACHINE(8_1, "8.1", false);
+DEFINE_SPAPR_MACHINE(8, 1);
/*
* pseries-8.0
@@ -4877,7 +4886,7 @@
compat_props_add(mc->compat_props, hw_compat_8_0, hw_compat_8_0_len);
}
-DEFINE_SPAPR_MACHINE(8_0, "8.0", false);
+DEFINE_SPAPR_MACHINE(8, 0);
/*
* pseries-7.2
@@ -4888,7 +4897,7 @@
compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
}
-DEFINE_SPAPR_MACHINE(7_2, "7.2", false);
+DEFINE_SPAPR_MACHINE(7, 2);
/*
* pseries-7.1
@@ -4899,7 +4908,7 @@
compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
}
-DEFINE_SPAPR_MACHINE(7_1, "7.1", false);
+DEFINE_SPAPR_MACHINE(7, 1);
/*
* pseries-7.0
@@ -4910,7 +4919,7 @@
compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
}
-DEFINE_SPAPR_MACHINE(7_0, "7.0", false);
+DEFINE_SPAPR_MACHINE(7, 0);
/*
* pseries-6.2
@@ -4921,7 +4930,7 @@
compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len);
}
-DEFINE_SPAPR_MACHINE(6_2, "6.2", false);
+DEFINE_SPAPR_MACHINE(6, 2);
/*
* pseries-6.1
@@ -4936,7 +4945,7 @@
mc->smp_props.prefer_sockets = true;
}
-DEFINE_SPAPR_MACHINE(6_1, "6.1", false);
+DEFINE_SPAPR_MACHINE(6, 1);
/*
* pseries-6.0
@@ -4947,7 +4956,7 @@
compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len);
}
-DEFINE_SPAPR_MACHINE(6_0, "6.0", false);
+DEFINE_SPAPR_MACHINE(6, 0);
/*
* pseries-5.2
@@ -4958,7 +4967,7 @@
compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len);
}
-DEFINE_SPAPR_MACHINE(5_2, "5.2", false);
+DEFINE_SPAPR_MACHINE(5, 2);
/*
* pseries-5.1
@@ -4972,7 +4981,7 @@
smc->pre_5_2_numa_associativity = true;
}
-DEFINE_SPAPR_MACHINE(5_1, "5.1", false);
+DEFINE_SPAPR_MACHINE(5, 1);
/*
* pseries-5.0
@@ -4991,7 +5000,7 @@
smc->pre_5_1_assoc_refpoints = true;
}
-DEFINE_SPAPR_MACHINE(5_0, "5.0", false);
+DEFINE_SPAPR_MACHINE(5, 0);
/*
* pseries-4.2
@@ -5008,7 +5017,7 @@
mc->nvdimm_supported = false;
}
-DEFINE_SPAPR_MACHINE(4_2, "4.2", false);
+DEFINE_SPAPR_MACHINE(4, 2);
/*
* pseries-4.1
@@ -5028,7 +5037,7 @@
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
-DEFINE_SPAPR_MACHINE(4_1, "4.1", false);
+DEFINE_SPAPR_MACHINE(4, 1);
/*
* pseries-4.0
@@ -5055,7 +5064,7 @@
smc->pre_4_1_migration = true;
}
-DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
+DEFINE_SPAPR_MACHINE(4, 0);
/*
* pseries-3.1
@@ -5077,7 +5086,7 @@
smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_OFF;
}
-DEFINE_SPAPR_MACHINE(3_1, "3.1", false);
+DEFINE_SPAPR_MACHINE(3, 1);
/*
* pseries-3.0
@@ -5095,7 +5104,7 @@
smc->irq = &spapr_irq_xics_legacy;
}
-DEFINE_SPAPR_MACHINE(3_0, "3.0", false);
+DEFINE_SPAPR_MACHINE(3, 0);
/*
* pseries-2.12
@@ -5120,7 +5129,7 @@
smc->default_caps.caps[SPAPR_CAP_HPT_MAXPAGESIZE] = 0;
}
-DEFINE_SPAPR_MACHINE(2_12, "2.12", false);
+DEFINE_SPAPR_MACHINE(2, 12);
static void spapr_machine_2_12_sxxm_class_options(MachineClass *mc)
{
@@ -5132,7 +5141,7 @@
smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_FIXED_CCD;
}
-DEFINE_SPAPR_MACHINE(2_12_sxxm, "2.12-sxxm", false);
+DEFINE_SPAPR_MACHINE_TAGGED(2, 12, sxxm);
/*
* pseries-2.11
@@ -5148,7 +5157,7 @@
mc->deprecation_reason = "old and not maintained - use a 2.12+ version";
}
-DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
+DEFINE_SPAPR_MACHINE(2, 11);
/*
* pseries-2.10
@@ -5160,7 +5169,7 @@
compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
}
-DEFINE_SPAPR_MACHINE(2_10, "2.10", false);
+DEFINE_SPAPR_MACHINE(2, 10);
/*
* pseries-2.9
@@ -5180,7 +5189,7 @@
smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED;
}
-DEFINE_SPAPR_MACHINE(2_9, "2.9", false);
+DEFINE_SPAPR_MACHINE(2, 9);
/*
* pseries-2.8
@@ -5198,7 +5207,7 @@
mc->numa_mem_align_shift = 23;
}
-DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
+DEFINE_SPAPR_MACHINE(2, 8);
/*
* pseries-2.7
@@ -5273,7 +5282,7 @@
smc->phb_placement = phb_placement_2_7;
}
-DEFINE_SPAPR_MACHINE(2_7, "2.7", false);
+DEFINE_SPAPR_MACHINE(2, 7);
/*
* pseries-2.6
@@ -5291,7 +5300,7 @@
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
-DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
+DEFINE_SPAPR_MACHINE(2, 6);
/*
* pseries-2.5
@@ -5310,7 +5319,7 @@
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
-DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
+DEFINE_SPAPR_MACHINE(2, 5);
/*
* pseries-2.4
@@ -5325,7 +5334,7 @@
compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len);
}
-DEFINE_SPAPR_MACHINE(2_4, "2.4", false);
+DEFINE_SPAPR_MACHINE(2, 4);
/*
* pseries-2.3
@@ -5340,7 +5349,7 @@
compat_props_add(mc->compat_props, hw_compat_2_3, hw_compat_2_3_len);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
-DEFINE_SPAPR_MACHINE(2_3, "2.3", false);
+DEFINE_SPAPR_MACHINE(2, 3);
/*
* pseries-2.2
@@ -5357,7 +5366,7 @@
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on";
}
-DEFINE_SPAPR_MACHINE(2_2, "2.2", false);
+DEFINE_SPAPR_MACHINE(2, 2);
/*
* pseries-2.1
@@ -5368,7 +5377,7 @@
spapr_machine_2_2_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);
}
-DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
+DEFINE_SPAPR_MACHINE(2, 1);
static void spapr_machine_register_types(void)
{
