summaryrefslogtreecommitdiffstats
path: root/hw/s390x
diff options
context:
space:
mode:
authorCornelia Huck2022-03-16 15:55:21 +0100
committerThomas Huth2022-04-20 09:36:24 +0200
commit0ca703662e3fd2f36a9bc36ffb256562ffb7b930 (patch)
tree7d3f1bfc4d56fb07846181e4f39a4e299265e771 /hw/s390x
parentdocs/ccid: convert to restructuredText (diff)
downloadqemu-0ca703662e3fd2f36a9bc36ffb256562ffb7b930.tar.gz
qemu-0ca703662e3fd2f36a9bc36ffb256562ffb7b930.tar.xz
qemu-0ca703662e3fd2f36a9bc36ffb256562ffb7b930.zip
hw: Add compat machines for 7.1
Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr. Signed-off-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20220316145521.1224083-1-cohuck@redhat.com> Reviewed-by: Eric Farman <farman@linux.ibm.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Acked-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Yanan Wang <wangyanan55@huawei.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/s390x')
-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 2d32647d08..8fa488d13a 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -792,14 +792,26 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+static void ccw_machine_7_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_7_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(7_1, "7.1", true);
+
static void ccw_machine_7_0_instance_options(MachineState *machine)
{
+ ccw_machine_7_1_instance_options(machine);
}
static void ccw_machine_7_0_class_options(MachineClass *mc)
{
+ ccw_machine_7_1_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
}
-DEFINE_CCW_MACHINE(7_0, "7.0", true);
+DEFINE_CCW_MACHINE(7_0, "7.0", false);
static void ccw_machine_6_2_instance_options(MachineState *machine)
{