From: Thomas Huth Date: Tue, 6 May 2025 06:21:44 +0000 (+0200) Subject: hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa3452c3914505e7352379179c10a22cc9017f84;p=thirdparty%2Fqemu.git hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type The s390-ccw-virtio-2.12 machine is older than 6 years, so according to our machine support policy, it can be removed now. Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250506062148.306084-6-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 104a24ee00..db3d26b2e4 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1238,20 +1238,6 @@ static void ccw_machine_3_0_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(3, 0); -static void ccw_machine_2_12_instance_options(MachineState *machine) -{ - ccw_machine_3_0_instance_options(machine); - s390_cpudef_featoff_greater(11, 1, S390_FEAT_PPA15); - s390_cpudef_featoff_greater(11, 1, S390_FEAT_BPB); -} - -static void ccw_machine_2_12_class_options(MachineClass *mc) -{ - ccw_machine_3_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len); -} -DEFINE_CCW_MACHINE(2, 12); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info);