On Thu, Sep 05, 2024 at 08:05:14PM +0100, Peter Maydell wrote:
> On Thu, 5 Sept 2024 at 19:22, Daniel P. Berrangé <berra...@redhat.com> wrote:
> >
> > On Fri, Aug 16, 2024 at 11:47:16AM +0100, Daniel P. Berrangé wrote:
> > > On Fri, Aug 16, 2024 at 12:37:23PM +0200, Cornelia Huck wrote:
> > > > Add 9.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.
> > > >
> > > > Signed-off-by: Cornelia Huck <coh...@redhat.com>
> > > > ---
> > > > hw/arm/virt.c | 9 ++++++++-
> > > > hw/core/machine.c | 3 +++
> > > > hw/i386/pc.c | 3 +++
> > > > hw/i386/pc_piix.c | 15 ++++++++++++---
> > > > hw/i386/pc_q35.c | 13 +++++++++++--
> > > > hw/m68k/virt.c | 9 ++++++++-
> > > > hw/ppc/spapr.c | 15 +++++++++++++--
> > > > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> > > > include/hw/boards.h | 3 +++
> > > > include/hw/i386/pc.h | 3 +++
> > > > 10 files changed, 77 insertions(+), 10 deletions(-)
> > >
> > > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
> > >
> > >
> > > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> > > > index d9e69243b4a7..746bfe05d386 100644
> > > > --- a/hw/i386/pc_piix.c
> > > > +++ b/hw/i386/pc_piix.c
> > > > @@ -479,13 +479,24 @@ static void
> > > > pc_i440fx_machine_options(MachineClass *m)
> > > > "Use a different south bridge
> > > > than PIIX3");
> > > > }
> > > >
> > > > -static void pc_i440fx_machine_9_1_options(MachineClass *m)
> > > > +static void pc_i440fx_machine_9_2_options(MachineClass *m)
> > > > {
> > > > pc_i440fx_machine_options(m);
> > > > m->alias = "pc";
> > > > m->is_default = true;
> > > > }
> > > >
> > > > +DEFINE_I440FX_MACHINE(9, 2);
> > > > +
> > > > +static void pc_i440fx_machine_9_1_options(MachineClass *m)
> > > > +{
> > > > + pc_i440fx_machine_9_2_options(m);
> > > > + m->alias = NULL;
> > > > + m->is_default = false;
> > > > + compat_props_add(m->compat_props, hw_compat_9_1,
> > > > hw_compat_9_1_len);
> > > > + compat_props_add(m->compat_props, pc_compat_9_1,
> > > > pc_compat_9_1_len);
> > > > +}
> > > > +
> > > > DEFINE_I440FX_MACHINE(9, 1);
> > > >
> > > > static void pc_i440fx_machine_9_0_options(MachineClass *m)
> > > > @@ -493,8 +504,6 @@ static void
> > > > pc_i440fx_machine_9_0_options(MachineClass *m)
> > > > PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> > > >
> > > > pc_i440fx_machine_9_1_options(m);
> > > > - m->alias = NULL;
> > > > - m->is_default = false;
> > > > m->smbios_memory_device_size = 16 * GiB;
> > >
> > > Feels like we should be adding an "_AS_LATEST" macro
> > > variant for piix/q35 too, so it matches the pattern
> > > in other targets for handling alias & is_default.
> > >
> > > Not a thing your patch needs todo though.
> >
> > I've just a patch that does that now. If it looks good & you want to include
> > it as a pre-requisite for your patch here feel free to grab, otherwise I can
> > rebase it after your patch merges.
>
> I have this patch in my target-arm pullreq that's currently posted
> and pending merge, by the way.
Ah ok, i'll rebase on top of that. then
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 :|
