From: Thomas Huth <thuth@redhat.com>
Date: Tue, 6 May 2025 06:21:40 +0000 (+0200)
Subject: hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 machine type
X-Git-Tag: v10.1.0-rc0~88^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cda6d7e282af53264228cdb4b233f624ab074161;p=thirdparty%2Fqemu.git

hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 machine type

The s390-ccw-virtio-2.10 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-2-thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index d5658afed96..206124f7a46 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1275,18 +1275,6 @@ static void ccw_machine_2_11_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(2, 11);
 
-static void ccw_machine_2_10_instance_options(MachineState *machine)
-{
-    ccw_machine_2_11_instance_options(machine);
-}
-
-static void ccw_machine_2_10_class_options(MachineClass *mc)
-{
-    ccw_machine_2_11_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
-}
-DEFINE_CCW_MACHINE(2, 10);
-
 #endif
 
 static void ccw_machine_register_types(void)