Re: [Xen-devel] [PATCH v2 04/12] pci: make PCI_SBDF2 return a pci_sbdf_t

[Roger Pau Monné <roger.pau@xxxxxxxxxx>]

On Thu, Jun 06, 2019 at 01:22:30PM +0200, Paul Durrant wrote:
> > -----Original Message-----
> > From: Xen-devel [mailto:xen-devel-bounces@xxxxxxxxxxxxxxxxxxxx] On Behalf 
> > Of Roger Pau Monne
> > Sent: 06 June 2019 10:02
> > To: xen-devel@xxxxxxxxxxxxxxxxxxxx
> > Cc: Kevin Tian <kevin.tian@xxxxxxxxx>; Stefano Stabellini 
> > <sstabellini@xxxxxxxxxx>; Wei Liu
> > <wl@xxxxxxx>; Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>; George Dunlap
> > <George.Dunlap@xxxxxxxxxx>; Andrew Cooper <Andrew.Cooper3@xxxxxxxxxx>; Ian 
> > Jackson
> > <Ian.Jackson@xxxxxxxxxx>; Tim (Xen.org) <tim@xxxxxxx>; Julien Grall 
> > <julien.grall@xxxxxxx>; Jan
> > Beulich <jbeulich@xxxxxxxx>; Roger Pau Monne <roger.pau@xxxxxxxxxx>
> > Subject: [Xen-devel] [PATCH v2 04/12] pci: make PCI_SBDF2 return a 
> > pci_sbdf_t
> > 
> > And fix it's only caller.
> > 
> > Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> > ---
> > Cc: Kevin Tian <kevin.tian@xxxxxxxxx>
> > Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> > Cc: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
> > Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> > Cc: Jan Beulich <jbeulich@xxxxxxxx>
> > Cc: Julien Grall <julien.grall@xxxxxxx>
> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> > Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> > Cc: Tim Deegan <tim@xxxxxxx>
> > Cc: Wei Liu <wl@xxxxxxx>
> > ---
> >  xen/drivers/passthrough/vtd/dmar.c | 2 +-
> >  xen/include/xen/pci.h              | 3 ++-
> >  2 files changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/xen/drivers/passthrough/vtd/dmar.c 
> > b/xen/drivers/passthrough/vtd/dmar.c
> > index 59a46cd1c6..b858fe7c80 100644
> > --- a/xen/drivers/passthrough/vtd/dmar.c
> > +++ b/xen/drivers/passthrough/vtd/dmar.c
> > @@ -1047,7 +1047,7 @@ int 
> > intel_iommu_get_reserved_device_memory(iommu_grdm_t *func, void *ctxt)
> > 
> >          rc = func(PFN_DOWN(rmrr->base_address),
> >                    PFN_UP(rmrr->end_address) - PFN_DOWN(rmrr->base_address),
> > -                  PCI_SBDF2(rmrr->segment, bdf), ctxt);
> > +                  PCI_SBDF2(rmrr->segment, bdf).sbdf, ctxt);
> > 
> >          if ( unlikely(rc < 0) )
> >              return rc;
> > diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
> > index 9ea41789d0..30afaca838 100644
> > --- a/xen/include/xen/pci.h
> > +++ b/xen/include/xen/pci.h
> > @@ -36,7 +36,8 @@
> >  #define PCI_BDF2(b,df)  ((((b) & 0xff) << 8) | ((df) & 0xff))
> >  #define PCI_SBDF(s,b,d,f) \
> >      ((pci_sbdf_t) { .sbdf = (((s) & 0xffff) << 16) | PCI_BDF(b,d,f) })
> > -#define PCI_SBDF2(s,bdf) ((((s) & 0xffff) << 16) | ((bdf) & 0xffff))
> > +#define PCI_SBDF2(s,bdf) \
> > +    ((pci_sbdf_t) { .sbdf = (((s) & 0xffff) << 16) | ((bdf) & 0xffff) })
> 
> Perhaps...
> 
> ((pci_sbdf_t) { .seg = s, .bdf = bdf })

That I'm afraid won't work with older versions of gcc.

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel