From: David Gibson <david@gibson.dropbear.id.au>
Date: Tue, 7 Mar 2017 00:02:28 +0000 (+1100)
Subject: pseries: Add pseries-2.10 machine type
X-Git-Tag: v2.10.0-rc0~227^2~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fa14fbe1310e8980072447ba405571be7a78a5d;p=thirdparty%2Fqemu.git

pseries: Add pseries-2.10 machine type

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 35db949dbc5..de5db75b686 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3157,19 +3157,38 @@ static const TypeInfo spapr_machine_info = {
     }                                                                \
     type_init(spapr_machine_register_##suffix)
 
+/*
+ * pseries-2.10
+ */
+static void spapr_machine_2_10_instance_options(MachineState *machine)
+{
+}
+
+static void spapr_machine_2_10_class_options(MachineClass *mc)
+{
+    /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(2_10, "2.10", true);
+
 /*
  * pseries-2.9
  */
+#define SPAPR_COMPAT_2_9                                               \
+    HW_COMPAT_2_9
+
 static void spapr_machine_2_9_instance_options(MachineState *machine)
 {
+    spapr_machine_2_10_instance_options(machine);
 }
 
 static void spapr_machine_2_9_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_2_10_class_options(mc);
+    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_9);
 }
 
-DEFINE_SPAPR_MACHINE(2_9, "2.9", true);
+DEFINE_SPAPR_MACHINE(2_9, "2.9", false);
 
 /*
  * pseries-2.8