Re: [Qemu-devel] [PATCH for-2.12 v3 01/11] spapr: add pseries 2.12 machine type

[David Gibson]

On Mon, Nov 13, 2017 at 10:50:10AM +0100, Greg Kurz wrote:
> On Mon, 13 Nov 2017 16:51:03 +1100
> David Gibson <address@hidden> wrote:
> 
> > On Fri, Nov 10, 2017 at 03:20:07PM +0000, Cédric Le Goater wrote:
> > > Signed-off-by: Cédric Le Goater <address@hidden>
> > > ---
> > >  hw/ppc/spapr.c | 16 +++++++++++++++-
> > >  1 file changed, 15 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > > index d682f013d422..a2dcbee07214 100644
> > > --- a/hw/ppc/spapr.c
> > > +++ b/hw/ppc/spapr.c
> > > @@ -3687,6 +3687,20 @@ static const TypeInfo spapr_machine_info = {
> > >      type_init(spapr_machine_register_##suffix)
> > >  
> > >  /*
> > > + * pseries-2.12
> > > + */
> > > +static void spapr_machine_2_12_instance_options(MachineState *machine)
> > > +{
> > > +}
> > > +
> > > +static void spapr_machine_2_12_class_options(MachineClass *mc)
> > > +{
> > > +    /* Defaults for the latest behaviour inherited from the base class */
> > > +}
> > > +
> > > +DEFINE_SPAPR_MACHINE(2_12, "2.12", true);
> > > +
> > > +/*
> > >   * pseries-2.11
> > >   */
> > >  static void spapr_machine_2_11_instance_options(MachineState *machine)
> > > @@ -3698,7 +3712,7 @@ static void 
> > > spapr_machine_2_11_class_options(MachineClass *mc)
> > >      /* Defaults for the latest behaviour inherited from the base class */
> > >  }
> > >  
> > > -DEFINE_SPAPR_MACHINE(2_11, "2.11", true);
> > > +DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
> > >  
> > >  /*
> > >   * pseries-2.10  
> > 
> > Uh.. not quite right.  You also need to chain the 2.11 hooks onto the
> 
> Well, this happens in patch 5, but you're right it probably makes more
> sense to consolidate in a single patch.
> 
> Also, this patch should have dropped the "Defaults for the latest..."
> comment...
> 
> > new 2.12 ones.  Never mind, we'll need it sooner or later, so I've put
> > my own version into ppc-for-2.12.
> > 
> 
> ... and so should your version I guess.

Good point, amended.

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature