@samitouri / QOSamiQemu / commits / 89343afd04

hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 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: <20250501223522.99772-2-philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> Signed-off-by: Thomas Huth <thuth@redhat.com>

Philippe Mathieu-Daudé committed May 2, 2025 at 00:35 UTC 89343afd0493932dc5999667656f8b74fa913cb4
2 files changed -20
hw/i386/pc_piix.c
-10
@@ -695,16 +695,6 @@ static void pc_i440fx_machine_2_11_options(MachineClass *m)
695
696 DEFINE_I440FX_MACHINE(2, 11);
697
698 -static void pc_i440fx_machine_2_10_options(MachineClass *m)
699 -{
700 - pc_i440fx_machine_2_11_options(m);
701 - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len);
702 - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len);
703 - m->auto_enable_numa_with_memhp = false;
704 -}
705 -
706 -DEFINE_I440FX_MACHINE(2, 10);
707 -
698 #ifdef CONFIG_XEN
699 static void xenfv_machine_4_2_options(MachineClass *m)
700 {
hw/i386/pc_q35.c
-10
@@ -642,13 +642,3 @@ static void pc_q35_machine_2_11_options(MachineClass *m)
642 }
643
644 DEFINE_Q35_MACHINE(2, 11);
645 -
646 -static void pc_q35_machine_2_10_options(MachineClass *m)
647 -{
648 - pc_q35_machine_2_11_options(m);
649 - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len);
650 - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len);
651 - m->auto_enable_numa_with_memhp = false;
652 -}
653 -
654 -DEFINE_Q35_MACHINE(2, 10);