]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type
authorThomas Huth <thuth@redhat.com>
Tue, 6 May 2025 06:21:44 +0000 (08:21 +0200)
committerThomas Huth <thuth@redhat.com>
Wed, 14 May 2025 04:56:34 +0000 (06:56 +0200)
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é <philmd@linaro.org>
Message-ID: <20250506062148.306084-6-thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
hw/s390x/s390-virtio-ccw.c

index 104a24ee0020428e686ac3f6d9109880c4c07cd5..db3d26b2e4e66b88b42a963d2bed11885d4727bc 100644 (file)
@@ -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);