From: Thomas Huth Date: Tue, 6 May 2025 06:21:45 +0000 (+0200) Subject: hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 machine type X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=240e7c36e75767ef102bd2c532947800aa0030d6;p=thirdparty%2Fqemu.git hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 machine type The s390-ccw-virtio-3.0 machine is older than 6 years, so according to our machine support policy, it can be removed now. Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250506062148.306084-7-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index db3d26b2e4..bec4690e85 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1223,21 +1223,6 @@ static void ccw_machine_3_1_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(3, 1); -static void ccw_machine_3_0_instance_options(MachineState *machine) -{ - ccw_machine_3_1_instance_options(machine); -} - -static void ccw_machine_3_0_class_options(MachineClass *mc) -{ - S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc); - - s390mc->hpage_1m_allowed = false; - ccw_machine_3_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len); -} -DEFINE_CCW_MACHINE(3, 0); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info);