summaryrefslogtreecommitdiffstats
path: root/hw/s390x/s390-virtio-ccw.c
diff options
context:
space:
mode:
authorCornelia Huck2020-04-29 16:46:05 +0200
committerStefan Berger2020-05-06 16:12:16 +0200
commit541aaa1df80df465c7dc934dc8cf57c0e3dfd6c3 (patch)
tree6b4ce0b9f7f8cff0a3694487c15cb944e8dd4405 /hw/s390x/s390-virtio-ccw.c
parenthw/arm/virt: Remove the compat forcing tpm-tis-device PPI to off (diff)
downloadqemu-541aaa1df80df465c7dc934dc8cf57c0e3dfd6c3.tar.gz
qemu-541aaa1df80df465c7dc934dc8cf57c0e3dfd6c3.tar.xz
qemu-541aaa1df80df465c7dc934dc8cf57c0e3dfd6c3.zip
hw: add compat machines for 5.1
Add 5.1 machine types for arm/i440fx/q35/s390x/spapr. Acked-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com> Message-id: 20200429144605.7262-1-cohuck@redhat.com
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
-rw-r--r--hw/s390x/s390-virtio-ccw.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 45292fb5a8..f660070d22 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -801,14 +801,26 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+static void ccw_machine_5_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_5_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(5_1, "5.1", true);
+
static void ccw_machine_5_0_instance_options(MachineState *machine)
{
+ ccw_machine_5_1_instance_options(machine);
}
static void ccw_machine_5_0_class_options(MachineClass *mc)
{
+ ccw_machine_5_1_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);
}
-DEFINE_CCW_MACHINE(5_0, "5.0", true);
+DEFINE_CCW_MACHINE(5_0, "5.0", false);
static void ccw_machine_4_2_instance_options(MachineState *machine)
{