aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2025-01-03 15:42:25 +0100
committerThomas Huth <thuth@redhat.com>2025-01-07 14:51:39 +0100
commit29ac4a4a4cae350c48a2c84386a5db594b79bc68 (patch)
treee89c6b8cd843aa235cdd30f3586eeff19691c46a
parent93edd339ff18a55d28f5070eaf9a59b3f8385249 (diff)
downloadqemu-29ac4a4a4cae350c48a2c84386a5db594b79bc68.zip
qemu-29ac4a4a4cae350c48a2c84386a5db594b79bc68.tar.gz
qemu-29ac4a4a4cae350c48a2c84386a5db594b79bc68.tar.bz2
hw/s390x/s390-virtio-ccw: Remove the deprecated 2.6 machine type
The s390-ccw-virtio-2.6 machine is older than 6 years, so according to our machine support policy, it can be removed now. Reviewed-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com> Message-ID: <20250103144232.520383-4-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--hw/s390x/s390-virtio-ccw.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index bca6148..341430a 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1305,26 +1305,6 @@ static void ccw_machine_2_7_class_options(MachineClass *mc)
}
DEFINE_CCW_MACHINE(2, 7);
-static void ccw_machine_2_6_instance_options(MachineState *machine)
-{
- ccw_machine_2_7_instance_options(machine);
-}
-
-static void ccw_machine_2_6_class_options(MachineClass *mc)
-{
- S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
- static GlobalProperty compat[] = {
- { TYPE_S390_IPL, "iplbext_migration", "off", },
- { TYPE_VIRTUAL_CSS_BRIDGE, "css_dev_path", "off", },
- };
-
- s390mc->ri_allowed = false;
- ccw_machine_2_7_class_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len);
- compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-}
-DEFINE_CCW_MACHINE(2, 6);
-
#endif
static void ccw_machine_register_types(void)