On Thu, 1 May 2025 23:04:51 +0200
Philippe Mathieu-Daudé <phi...@linaro.org> wrote:
> 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>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> 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 0d6ad9db627..5c7d0c50f8e 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -737,15 +737,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_ISAPC
> static void isapc_machine_options(MachineClass *m)
> {
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 54c18100122..d66d64b3b62 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -630,12 +630,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);
