summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2016-09-28 14:31:55 +1000
committerDavid Gibson <david@gibson.dropbear.id.au>2016-10-05 11:05:28 +1100
commitdb800b21d82a63eb88b06da9d1fb3d8a8e046aca (patch)
treed271f657f248358c56017ac061a096952c417461
parent1485ef1c45eb349c841c22b1d31a51a5ece68a89 (diff)
downloadqemu-db800b21d82a63eb88b06da9d1fb3d8a8e046aca.zip
pseries: Add 2.8 machine type, set up compatibility macros
Now that 2.7 is released, create the pseries-2.8 machine type and add the boilerplate compatiblity macro stuff. There's nothing new to put into the 2.7 compatiliby properties yet, but we'll need something eventually, so we might as well get it ready now. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--hw/ppc/spapr.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 14b6821a94..420ad1b741 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2437,18 +2437,36 @@ static const TypeInfo spapr_machine_info = {
type_init(spapr_machine_register_##suffix)
/*
+ * pseries-2.8
+ */
+static void spapr_machine_2_8_instance_options(MachineState *machine)
+{
+}
+
+static void spapr_machine_2_8_class_options(MachineClass *mc)
+{
+ /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(2_8, "2.8", true);
+
+/*
* pseries-2.7
*/
+#define SPAPR_COMPAT_2_7 \
+ HW_COMPAT_2_7 \
+
static void spapr_machine_2_7_instance_options(MachineState *machine)
{
}
static void spapr_machine_2_7_class_options(MachineClass *mc)
{
- /* Defaults for the latest behaviour inherited from the base class */
+ spapr_machine_2_8_class_options(mc);
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_7);
}
-DEFINE_SPAPR_MACHINE(2_7, "2.7", true);
+DEFINE_SPAPR_MACHINE(2_7, "2.7", false);
/*
* pseries-2.6