[PATCH 10/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.1 machine

Philippe Mathieu-Daudé posted 12 patches 4 weeks ago
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>
[PATCH 10/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.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 | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 942b1e5a932..cf09b5c46e6 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1022,30 +1022,6 @@ static void ccw_machine_7_2_class_options(MachineClass *mc)
 }
 DEFINE_CCW_MACHINE(7, 2);
 
-static void ccw_machine_7_1_instance_options(MachineState *machine)
-{
-    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_1 };
-
-    ccw_machine_7_2_instance_options(machine);
-    s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE);
-    s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat);
-}
-
-static void ccw_machine_7_1_class_options(MachineClass *mc)
-{
-    S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
-    static GlobalProperty compat[] = {
-        { TYPE_S390_PCI_DEVICE, "interpret", "off", },
-        { TYPE_S390_PCI_DEVICE, "forwarding-assist", "off", },
-    };
-
-    ccw_machine_7_2_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-    s390mc->max_threads = S390_MAX_CPUS;
-}
-DEFINE_CCW_MACHINE(7, 1);
-
 static void ccw_machine_register_types(void)
 {
     type_register_static(&ccw_machine_info);
-- 
2.51.0