]> git.proxmox.com Git - mirror_qemu.git/commitdiff
spapr: Introduce pseries-2.7 machine type
authorBharata B Rao <bharata@linux.vnet.ibm.com>
Fri, 3 Jun 2016 05:49:42 +0000 (11:19 +0530)
committerDavid Gibson <david@gibson.dropbear.id.au>
Tue, 7 Jun 2016 00:17:45 +0000 (10:17 +1000)
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
hw/ppc/spapr.c

index 14cc6ae757f72e9d86b92a9a16b2bb537751b2f5..063664234106ede2b215edb819f22b001655eaee 100644 (file)
@@ -2353,19 +2353,37 @@ static const TypeInfo spapr_machine_info = {
     }                                                                \
     type_init(spapr_machine_register_##suffix)
 
+/*
+ * pseries-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 */
+}
+
+DEFINE_SPAPR_MACHINE(2_7, "2.7", true);
+
 /*
  * pseries-2.6
  */
+#define SPAPR_COMPAT_2_6 \
+    HW_COMPAT_2_6
+
 static void spapr_machine_2_6_instance_options(MachineState *machine)
 {
 }
 
 static void spapr_machine_2_6_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_2_7_class_options(mc);
+    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6);
 }
 
-DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
+DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
 
 /*
  * pseries-2.5