On Tue, Apr 16, 2024 at 08:59:36PM +0200, Philippe Mathieu-Daudé wrote:
> The pc-i440fx-2.3 machine was deprecated for the 8.2
> release (see commit c7437f0ddb "docs/about: Mark the
> old pc-i440fx-2.0 - 2.3 machine types as deprecated"),
> time to remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
> ---
> docs/about/deprecated.rst | 4 ++--
> docs/about/removed-features.rst | 2 +-
> hw/i386/pc.c | 25 -------------------------
> hw/i386/pc_piix.c | 19 -------------------
> 4 files changed, 3 insertions(+), 47 deletions(-)
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 30bcd86ee6..370d130a6d 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -421,14 +421,6 @@ static void pc_set_south_bridge(Object *obj, int value, Error **errp)
> * hw_compat_*, pc_compat_*, or * pc_*_machine_options().
> */
The comment that is just out of sight in the diff is now obsolete
and should be removed too.
>
> -static void pc_compat_2_3_fn(MachineState *machine)
> -{
> - X86MachineState *x86ms = X86_MACHINE(machine);
> - if (kvm_enabled()) {
> - x86ms->smm = ON_OFF_AUTO_OFF;
> - }
> -}
> -
> #ifdef CONFIG_ISAPC
> static void pc_init_isa(MachineState *machine)
> {
> @@ -812,17 +804,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
> DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,
> pc_i440fx_2_4_machine_options)
>
> -static void pc_i440fx_2_3_machine_options(MachineClass *m)
> -{
> - pc_i440fx_2_4_machine_options(m);
> - m->hw_version = "2.3.0";
> - compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len);
> - compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len);
> -}
> -
> -DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn,
> - pc_i440fx_2_3_machine_options);
This is the last DEFINE_I440FX_MACHINE call that provides a
non-NULL 3rd parameter.
IOW, there could be a further patch removing the 3rd 'compatfn'
parameter now it is finally obsolete.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
