From: Roger Pau Monné Date: Tue, 11 Jun 2019 15:18:22 +0000 (+0200) Subject: pci: make PCI_SBDF return a pci_sbdf_t X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cde324fbad4bb8f920f0f5da6eaa56e228c65f4a;p=people%2Fsstabellini%2Fxen-unstable.git%2F.git pci: make PCI_SBDF return a pci_sbdf_t And adjust it's only user. Signed-off-by: Roger Pau Monné Reviewed-by: Paul Durrant Acked-by: Jan Beulich --- diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 9cc8623e53..59a46cd1c6 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -1115,7 +1115,8 @@ static int __init parse_rmrr_param(const char *str) /* Keep sbdf's even if they differ and later report an error. */ dev_count = user_rmrrs[nr_rmrr].dev_count; - user_rmrrs[nr_rmrr].sbdf[dev_count] = PCI_SBDF(seg, bus, dev, func); + user_rmrrs[nr_rmrr].sbdf[dev_count] = + PCI_SBDF(seg, bus, dev, func).sbdf; user_rmrrs[nr_rmrr].dev_count++; s = stmp; diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index b03927cd28..b55cff954c 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -34,7 +34,8 @@ #define PCI_DEVFN2(bdf) ((bdf) & 0xff) #define PCI_BDF(b,d,f) ((((b) & 0xff) << 8) | PCI_DEVFN(d,f)) #define PCI_BDF2(b,df) ((((b) & 0xff) << 8) | ((df) & 0xff)) -#define PCI_SBDF(s,b,d,f) ((((s) & 0xffff) << 16) | PCI_BDF(b,d,f)) +#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_SBDF3(s,b,df) ((((s) & 0xffff) << 16) | PCI_BDF2(b, df))