@samitouri / QOSamiQemu / commits / 0313087adf

hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 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-8-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 0313087adfc428622b40447b2f799d6140220088
2 files changed -18
hw/i386/pc_piix.c
-9
@@ -677,15 +677,6 @@ static void pc_i440fx_machine_3_0_options(MachineClass *m)
677
678 DEFINE_I440FX_MACHINE(3, 0);
679
680 -static void pc_i440fx_machine_2_12_options(MachineClass *m)
681 -{
682 - pc_i440fx_machine_3_0_options(m);
683 - compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
684 - compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
685 -}
686 -
687 -DEFINE_I440FX_MACHINE(2, 12);
688 -
680 #ifdef CONFIG_XEN
681 static void xenfv_machine_4_2_options(MachineClass *m)
682 {
hw/i386/pc_q35.c
-9
@@ -623,12 +623,3 @@ static void pc_q35_machine_3_0_options(MachineClass *m)
623 }
624
625 DEFINE_Q35_MACHINE(3, 0);
626 -
627 -static void pc_q35_machine_2_12_options(MachineClass *m)
628 -{
629 - pc_q35_machine_3_0_options(m);
630 - compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
631 - compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
632 -}
633 -
634 -DEFINE_Q35_MACHINE(2, 12);