On Thu, May 02, 2024 at 02:08:58PM +0200, Thomas Huth wrote:
> On 01/05/2024 20.27, Daniel P. Berrangé wrote:
> > The automatic deprecation mechanism introduced in the preceeding patches
> > will mark every i440fx machine upto and including 2.12 as deprecated. As
> > such we can revert the manually added deprecation which was a subset:
> >
> > commit c7437f0ddb8ee45bf96d949ddfcbb7697ae3d415
> > Author: Thomas Huth <th...@redhat.com>
> > Date: Fri Oct 6 09:52:47 2023 +0200
> >
> > docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as
> > deprecated
> >
> > Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
> > ---
> > hw/i386/pc_piix.c | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> > index 9f92504cc4..4137e03f6f 100644
> > --- a/hw/i386/pc_piix.c
> > +++ b/hw/i386/pc_piix.c
> > @@ -812,7 +812,6 @@ static void pc_i440fx_machine_2_3_options(MachineClass
> > *m)
> > {
> > pc_i440fx_machine_2_4_options(m);
> > m->hw_version = "2.3.0";
> > - m->deprecation_reason = "old and unattended - use a newer version
> > instead";
> > 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);
> > }
>
> This will conflict with Philippe's "hw/i386: Remove deprecated pc-i440fx-2.0
> -> 2.3 machines" patch series (which should easy to resolve, though).
Yep, there are a few places in my series which will conflict with
that.
I've just looked at Philippe's code and everything has at least
one R-b. I had a minor comment but I could address that in this
series.
IOW, ideally we could merge Philippe's series now, to reduce
code in flight touching the same areas.
> Anyway:
> Reviewed-by: Thomas Huth <th...@redhat.com>
>
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 :|
