Re: [qemu-s390x] [PATCH v5 05/17] spapr/drc: Drop spapr_drc_attach() fdt argument

[Greg Kurz]

On Wed, 20 Feb 2019 14:22:19 +1100
David Gibson <address@hidden> wrote:

> On Tue, Feb 19, 2019 at 06:17:58PM +0100, Greg Kurz wrote:
> > All DRC subtypes have been converted to generate the FDT fragment at
> > configure connector time instead of attach time. The fdt and fdt_offset
> > arguments of spapr_drc_attach() aren't needed anymore. Drop them and
> > make the implementation of the dt_populate() method mandatory.
> > 
> > Signed-off-by: Greg Kurz <address@hidden>  
> 
> I've applied the first 5 patches to ppc-for-4.0, but as a followup...
> 
> [...]
> > @@ -1113,8 +1104,6 @@ static void rtas_ibm_configure_connector(PowerPCCPU 
> > *cpu,
> >  
> >      drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
> >  
> > -    g_assert(drc->fdt || drck->dt_populate);
> > -
> >      if (!drc->fdt) {  
> 
> ..you can now remove this conditional, since it will always be true.
> 

Hmm... I'm afraid this is not true since configure-connector is supposed
to be called several times according to PAPR. And this is exactly what
the code does: first return the node name to the guest, then all properties
and subnodes one at a time...

pgpd_tHepmXi3.pgp
Description: OpenPGP digital signature