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: Thomas Huth <[email protected]> Reviewed-by: Xiaoyao Li <[email protected]> Signed-off-by: Thomas Huth <[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 64927b47d92..8a4b6509444 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -686,15 +686,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_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 ad40e9045b2..60a1b75b450 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -632,13 +632,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); -- 2.53.0
