diff options
| author | Thomas Huth <thuth@redhat.com> | 2025-05-06 08:21:41 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2025-05-14 06:55:36 +0200 |
| commit | ea9544b7e8e1e1ce971877e1e1367d98209543ef (patch) | |
| tree | 505d600331380e4fe102459cb08722ed46f36b75 | |
| parent | cda6d7e282af53264228cdb4b233f624ab074161 (diff) | |
| download | qemu-ea9544b7e8e1e1ce971877e1e1367d98209543ef.zip qemu-ea9544b7e8e1e1ce971877e1e1367d98209543ef.tar.gz qemu-ea9544b7e8e1e1ce971877e1e1367d98209543ef.tar.bz2 | |
hw/s390x/s390-virtio-ccw: Remove the deprecated 2.11 machine type
The s390-ccw-virtio-2.11 machine is older than 6 years, so according
to our machine support policy, it can be removed now.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250506062148.306084-3-thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 206124f..104a24e 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1252,31 +1252,6 @@ static void ccw_machine_2_12_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(2, 12); -#ifdef CONFIG_S390X_LEGACY_CPUS - -static void ccw_machine_2_11_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_11 }; - ccw_machine_2_12_instance_options(machine); - - /* before 2.12 we emulated the very first z900 */ - s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat); -} - -static void ccw_machine_2_11_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] = { - { TYPE_SCLP_EVENT_FACILITY, "allow_all_mask_sizes", "off", }, - }; - - ccw_machine_2_12_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} -DEFINE_CCW_MACHINE(2, 11); - -#endif - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); |