On 02/05/2025 00.35, Philippe Mathieu-Daudé wrote:
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é <[email protected]>
---
hw/i386/pc_piix.c | 9 ---------
hw/i386/pc_q35.c | 10 ----------
2 files changed, 19 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index f0f71de4405..4de84bce8ef 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -718,15 +718,6 @@ static void pc_i440fx_machine_2_12_options(MachineClass *m)
DEFINE_I440FX_MACHINE(2, 12);
-static void pc_i440fx_machine_2_11_options(MachineClass *m)
-{
- pc_i440fx_machine_2_12_options(m);
- compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
- compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
-}
-
-DEFINE_I440FX_MACHINE(2, 11);
-
#ifdef CONFIG_ISAPC
static void isapc_machine_options(MachineClass *m)
{
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 1bbf2385431..4839e8c5731 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -610,13 +610,3 @@ static void pc_q35_machine_2_12_options(MachineClass *m)
}
DEFINE_Q35_MACHINE(2, 12);
-
-static void pc_q35_machine_2_11_options(MachineClass *m)
-{
- pc_q35_machine_2_12_options(m);
- m->default_nic = "e1000";
- compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
- compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
-}
-
-DEFINE_Q35_MACHINE(2, 11);
Reviewed-by: Thomas Huth <[email protected]>
