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 | 10 ---------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d8417d1824f..64927b47d92 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -695,16 +695,6 @@ static void pc_i440fx_machine_2_11_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 11); -static void pc_i440fx_machine_2_10_options(MachineClass *m) -{ - pc_i440fx_machine_2_11_options(m); - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->auto_enable_numa_with_memhp = false; -} - -DEFINE_I440FX_MACHINE(2, 10); - #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 b94d1839e3f..ad40e9045b2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -642,13 +642,3 @@ static void pc_q35_machine_2_11_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 11); - -static void pc_q35_machine_2_10_options(MachineClass *m) -{ - pc_q35_machine_2_11_options(m); - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->auto_enable_numa_with_memhp = false; -} - -DEFINE_Q35_MACHINE(2, 10); -- 2.53.0
