@samitouri / QOSamiQemu / commits / 1c6cef54a2

hw/i386/pc: Remove deprecated pc-q35-2.9 and pc-i440fx-2.9 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> Message-ID: <20250501210456.89071-14-philmd@linaro.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Message-ID: <20260225092024.794595-11-thuth@redhat.com>

Philippe Mathieu-Daudé committed Feb 25, 2026 at 10:20 UTC 1c6cef54a2ceef9756897c0066e74d60b1decea0
2 files changed -18
hw/i386/pc_piix.c
-9
@@ -705,15 +705,6 @@ static void pc_i440fx_machine_2_10_options(MachineClass *m)
705
706 DEFINE_I440FX_MACHINE(2, 10);
707
708 -static void pc_i440fx_machine_2_9_options(MachineClass *m)
709 -{
710 - pc_i440fx_machine_2_10_options(m);
711 - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len);
712 - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len);
713 -}
714 -
715 -DEFINE_I440FX_MACHINE(2, 9);
716 -
708 #ifdef CONFIG_XEN
709 static void xenfv_machine_4_2_options(MachineClass *m)
710 {
hw/i386/pc_q35.c
-9
@@ -652,12 +652,3 @@ static void pc_q35_machine_2_10_options(MachineClass *m)
652 }
653
654 DEFINE_Q35_MACHINE(2, 10);
655 -
656 -static void pc_q35_machine_2_9_options(MachineClass *m)
657 -{
658 - pc_q35_machine_2_10_options(m);
659 - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len);
660 - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len);
661 -}
662 -
663 -DEFINE_Q35_MACHINE(2, 9);