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]> Reviewed-by: Thomas Huth <[email protected]> Message-Id: <[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 961432176cf..29c8e997131 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -668,15 +668,6 @@ static void pc_i440fx_machine_3_1_options(MachineClass *m) DEFINE_I440FX_MACHINE(3, 1); -static void pc_i440fx_machine_3_0_options(MachineClass *m) -{ - pc_i440fx_machine_3_1_options(m); - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len); - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len); -} - -DEFINE_I440FX_MACHINE(3, 0); - #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 261d759a223..f102da8e4a1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -614,12 +614,3 @@ static void pc_q35_machine_3_1_options(MachineClass *m) } DEFINE_Q35_MACHINE(3, 1); - -static void pc_q35_machine_3_0_options(MachineClass *m) -{ - pc_q35_machine_3_1_options(m); - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len); - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len); -} - -DEFINE_Q35_MACHINE(3, 0); -- 2.53.0
