@samitouri / QOSamiQemu / commits / b2e0f64776

hw/i386/pc: Remove deprecated pc-q35-3.0 and pc-i440fx-3.0 machines

These machines 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") they can now be removed. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20260307150042.78030-2-philmd@linaro.org>

Philippe Mathieu-Daudé committed Apr 29, 2025 at 16:45 UTC b2e0f64776c59690d74b8368320d9d8a440f364c
2 files changed -18
hw/i386/pc_piix.c
-9
@@ -668,15 +668,6 @@ static void pc_i440fx_machine_3_1_options(MachineClass *m)
668
669 DEFINE_I440FX_MACHINE(3, 1);
670
671 -static void pc_i440fx_machine_3_0_options(MachineClass *m)
672 -{
673 - pc_i440fx_machine_3_1_options(m);
674 - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len);
675 - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len);
676 -}
677 -
678 -DEFINE_I440FX_MACHINE(3, 0);
679 -
671 #ifdef CONFIG_XEN
672 static void xenfv_machine_4_2_options(MachineClass *m)
673 {
hw/i386/pc_q35.c
-9
@@ -614,12 +614,3 @@ static void pc_q35_machine_3_1_options(MachineClass *m)
614 }
615
616 DEFINE_Q35_MACHINE(3, 1);
617 -
618 -static void pc_q35_machine_3_0_options(MachineClass *m)
619 -{
620 - pc_q35_machine_3_1_options(m);
621 - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len);
622 - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len);
623 -}
624 -
625 -DEFINE_Q35_MACHINE(3, 0);