Re: [PATCH 20/20] spapr: Eliminate SpaprIrq::init hook

[Greg Kurz]

On Thu, 26 Sep 2019 17:39:37 +0200
Greg Kurz <address@hidden> wrote:

> On Wed, 25 Sep 2019 16:45:34 +1000
> David Gibson <address@hidden> wrote:
> 
> > This method is used to set up the interrupt backends for the current
> > configuration.  However, this means some confusing redirection between
> > the "dual" mode init and the init hooks for xics only and xive only modes.
> > 
> > Since we now have simple flags indicating whether XICS and/or XIVE are
> > supported, it's easier to just open code each initialization directly in
> > spapr_irq_init().  This will also make some future cleanups simpler.
> > 
> > Signed-off-by: David Gibson <address@hidden>
> > ---
> 
> Reviewed-by: Greg Kurz <address@hidden>
> 

Just one nit...

> >  hw/ppc/spapr_irq.c          | 138 ++++++++++++++++--------------------
> >  include/hw/ppc/spapr_irq.h  |   1 -
> >  include/hw/ppc/xics_spapr.h |   1 +
[...]
> > diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h
> > index 691a6d00f7..267984a97b 100644
> > --- a/include/hw/ppc/xics_spapr.h
> > +++ b/include/hw/ppc/xics_spapr.h
> > @@ -34,6 +34,7 @@
> >  #define TYPE_ICS_SPAPR "ics-spapr"
> >  #define ICS_SPAPR(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SPAPR)
> >  
> > +void ics_spapr_create(SpaprMachineState *spapr, int nr_xirqs, Error 
> > **errp);

... this looks like a leftover.

> >  void spapr_dt_xics(SpaprMachineState *spapr, uint32_t nr_servers, void 
> > *fdt,
> >                     uint32_t phandle);
> >  int xics_kvm_connect(SpaprMachineState *spapr, Error **errp);
>