]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
s390x: add compat machine for 2.9
authorCornelia Huck <cornelia.huck@de.ibm.com>
Wed, 30 Nov 2016 14:52:46 +0000 (15:52 +0100)
committerCornelia Huck <cornelia.huck@de.ibm.com>
Fri, 20 Jan 2017 08:48:09 +0000 (09:48 +0100)
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
hw/s390x/s390-virtio-ccw.c

index dbf4f01165c1ebc2771c0a67b23ccc35c389f83b..e9a676797af4e71e45a5cb4a0fb0314554d7a58e 100644 (file)
@@ -335,6 +335,9 @@ static const TypeInfo ccw_machine_info = {
     }                                                                         \
     type_init(ccw_machine_register_##suffix)
 
+#define CCW_COMPAT_2_8 \
+        HW_COMPAT_2_8
+
 #define CCW_COMPAT_2_7 \
         HW_COMPAT_2_7
 
@@ -393,14 +396,26 @@ static const TypeInfo ccw_machine_info = {
             .value    = "0",\
         },
 
+static void ccw_machine_2_9_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_2_9_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(2_9, "2.9", true);
+
 static void ccw_machine_2_8_instance_options(MachineState *machine)
 {
+    ccw_machine_2_9_instance_options(machine);
 }
 
 static void ccw_machine_2_8_class_options(MachineClass *mc)
 {
+    ccw_machine_2_9_class_options(mc);
+    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_8);
 }
-DEFINE_CCW_MACHINE(2_8, "2.8", true);
+DEFINE_CCW_MACHINE(2_8, "2.8", false);
 
 static void ccw_machine_2_7_instance_options(MachineState *machine)
 {