@samitouri / QOSamiQemu / commits / 89d48b3f91

hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 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-6-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 89d48b3f916414a8a72cc5bcb7ec1f365e593f6a
2 files changed -19
hw/i386/pc_piix.c
-9
@@ -686,15 +686,6 @@ static void pc_i440fx_machine_2_12_options(MachineClass *m)
686
687 DEFINE_I440FX_MACHINE(2, 12);
688
689 -static void pc_i440fx_machine_2_11_options(MachineClass *m)
690 -{
691 - pc_i440fx_machine_2_12_options(m);
692 - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
693 - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
694 -}
695 -
696 -DEFINE_I440FX_MACHINE(2, 11);
697 -
689 #ifdef CONFIG_XEN
690 static void xenfv_machine_4_2_options(MachineClass *m)
691 {
hw/i386/pc_q35.c
-10
@@ -632,13 +632,3 @@ static void pc_q35_machine_2_12_options(MachineClass *m)
632 }
633
634 DEFINE_Q35_MACHINE(2, 12);
635 -
636 -static void pc_q35_machine_2_11_options(MachineClass *m)
637 -{
638 - pc_q35_machine_2_12_options(m);
639 - m->default_nic = "e1000";
640 - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
641 - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
642 -}
643 -
644 -DEFINE_Q35_MACHINE(2, 11);