Re: [Qemu-ppc] [PATCH for-2.13 13/13] target/ppc: Fold slb_nr into PPCHash64Options

[Cornelia Huck]

On Thu, 5 Apr 2018 15:12:55 +0200
Greg Kurz <address@hidden> wrote:

> On Thu,  5 Apr 2018 12:14:37 +1000
> David Gibson <address@hidden> wrote:

> > @@ -4000,7 +4000,12 @@ DEFINE_SPAPR_MACHINE(2_13, "2.13", true);
> >   * pseries-2.12
> >   */
> >  #define SPAPR_COMPAT_2_12                                              \
> > -    HW_COMPAT_2_12  
> 
> This hunk doesn't apply on master, nor on your ppc-for-2.13 branch...
> 
> It looks like a patch to introduce the 2.13 machine type is missing.
> 
> FWIW, Connie has already queued a patch to do so for s390x, that also
> introduces HW_COMPAT_2_12.
> 
> https://github.com/cohuck/qemu/commit/b54cde7350b6681b4349b904e0f9a8a8d58c0951
> 
> Maybe the HW_COMPAT_ macros should be added in a standalone patch ?
> 
> Cc'ing Connie for insights.
> 
> > +    HW_COMPAT_2_12                                                     \
> > +    {                                                                  \
> > +        .driver = TYPE_POWERPC_CPU,                                    \
> > +            .property = "pre-2.13-migration",                          \
> > +            .value    = "on",                                          \  

I think the usual procedure is

- every arch that uses compat machines queues a patch that creates the
  new compat machine(s) and adds an empty HW_COMPAT_<version>
- whoever has their queue pulled first wins wrt hw_compat

So, I'm happy with anyone adding the empty HW_COMPAT_2_12 -- it needn't
be me :)

[We could also introduce the 2.13 machines for all architectures in one
sweep, but I think that would be generating needless churn for arch
maintainers.]