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é <phi...@linaro.org> --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 4de84bce8ef..a8fda35bb9b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -709,15 +709,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_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4839e8c5731..0c7b407952c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -601,12 +601,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); -- 2.47.1