Commit 0313087adf for qemu.org
commit 0313087adfc428622b40447b2f799d6140220088
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Fri May 2 00:35:21 2025 +0200
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>
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 8a4b650944..961432176c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -677,15 +677,6 @@ static void pc_i440fx_machine_3_0_options(MachineClass *m)
DEFINE_I440FX_MACHINE(3, 0);
-static void pc_i440fx_machine_2_12_options(MachineClass *m)
-{
- pc_i440fx_machine_3_0_options(m);
- compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
- compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
-}
-
-DEFINE_I440FX_MACHINE(2, 12);
-
#ifdef CONFIG_XEN
static void xenfv_machine_4_2_options(MachineClass *m)
{
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 60a1b75b45..261d759a22 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -623,12 +623,3 @@ static void pc_q35_machine_3_0_options(MachineClass *m)
}
DEFINE_Q35_MACHINE(3, 0);
-
-static void pc_q35_machine_2_12_options(MachineClass *m)
-{
- pc_q35_machine_3_0_options(m);
- compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
- compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
-}
-
-DEFINE_Q35_MACHINE(2, 12);