hw/s390x: Remove s390-ccw-virtio-4.2 -> s390-ccw-virtio-7.2 machines

[PATCH 04/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.1 machine

Philippe Mathieu-Daudé posted 12 patches 4 weeks ago

Download mbox

Maintainers: Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Jason Herne <jjherne@linux.ibm.com>

Expand all Fold all

[PATCH 04/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.1 machine

Posted by Philippe Mathieu-Daudé 4 weeks ago

This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-virtio-ccw.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index e1868eb7cc8..7be998168e8 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1121,18 +1121,6 @@ static void ccw_machine_5_2_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(5, 2);
 
-static void ccw_machine_5_1_instance_options(MachineState *machine)
-{
-    ccw_machine_5_2_instance_options(machine);
-}
-
-static void ccw_machine_5_1_class_options(MachineClass *mc)
-{
-    ccw_machine_5_2_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
-}
-DEFINE_CCW_MACHINE(5, 1);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0