Re: [PATCH 2/3] hw/i386/pc_piix: Remove pc-i440fx-2.4 up to pc-i440fx-2.12

[Kashyap Chamarthy]

On Fri, Jan 17, 2025 at 11:27:37AM +0100, Thomas Huth wrote:
> These machines have explicitly been marked as deprecated in
> QEMU 9.1, so it should be fine to remove these antique versioned
> machine types two releases later in 10.0.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  docs/about/deprecated.rst       |  7 ---
>  docs/about/removed-features.rst |  4 +-
>  docs/interop/firmware.json      |  2 +-
>  hw/i386/pc_piix.c               | 95 ---------------------------------
>  qemu-options.hx                 | 10 ++--
>  5 files changed, 8 insertions(+), 110 deletions(-)

Looks good to me.  Nice that it has the side-effect of speeding up a
bit of the upstream CI, as it drops unncessary tests.  I also saw your
note in the cover letter that the corresponding Q35 machine types will
be removed in QEMU 10.1.  Thanks!

FWIW:

    Reviewed-by: Kashyap Chamarthy <kchamart@redhat.com>

> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 4a3c302962..7b42d6eecc 100644

[...]

>  PPC 405 ``ref405ep`` machine (since 9.1)
>  ''''''''''''''''''''''''''''''''''''''''
>  
> diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
> index c6616ce05e..936846ed7b 100644
> --- a/docs/about/removed-features.rst
> +++ b/docs/about/removed-features.rst
> @@ -1006,8 +1006,8 @@ mips ``fulong2e`` machine alias (removed in 6.0)
>  
>  This machine has been renamed ``fuloong2e``.
>  
> -``pc-0.10`` up to ``pc-i440fx-2.3`` (removed in 4.0 up to 9.0)
> -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +``pc-0.10`` up to ``pc-i440fx-2.12`` (removed in 4.0 up to 10.0)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
>  
>  These machine types were very old and likely could not be used for live
>  migration from old QEMU versions anymore. Use a newer machine type instead.
> diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json
> index 57f55f6c54..f1e74318ff 100644
> --- a/docs/interop/firmware.json
> +++ b/docs/interop/firmware.json
> @@ -97,7 +97,7 @@
>  #            machine types, not aliases. Glob patterns are understood,
>  #            which is especially useful for versioned machine types.
>  #            (For example, the glob pattern "pc-i440fx-*" matches
> -#            "pc-i440fx-2.12".) On the QEMU command line, "-machine
> +#            "pc-i440fx-9.1".) On the QEMU command line, "-machine
>  #            type=..." specifies the requested machine type (but that
>  #            option does not accept glob patterns).
>  #
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 04d2957adc..b821c32b38 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -698,101 +698,6 @@ static void pc_i440fx_machine_3_0_options(MachineClass 
> *m)
>  
>  DEFINE_I440FX_MACHINE(3, 0);
>  
> -static void pc_i440fx_machine_2_12_options(MachineClass *m)
> -{
> -    pc_i440fx_machine_3_0_options(m);
> -    compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
> -    compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
> -}

[...]


-- 
/kashyap