From: Philippe Mathieu-Daudé <[email protected]> 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]> Message-ID: <[email protected]> Reviewed-by: Igor Mammedov <[email protected]> Signed-off-by: Thomas Huth <[email protected]> --- 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 58d76d2d410..d8417d1824f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -705,15 +705,6 @@ static void pc_i440fx_machine_2_10_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 10); -static void pc_i440fx_machine_2_9_options(MachineClass *m) -{ - pc_i440fx_machine_2_10_options(m); - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); -} - -DEFINE_I440FX_MACHINE(2, 9); - #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 7fe6ca64f9d..b94d1839e3f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -652,12 +652,3 @@ static void pc_q35_machine_2_10_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 10); - -static void pc_q35_machine_2_9_options(MachineClass *m) -{ - pc_q35_machine_2_10_options(m); - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); -} - -DEFINE_Q35_MACHINE(2, 9); -- 2.53.0
