And use an union with the current seg, bus and devfn fields to make
fields point to the same underlying data.
No functional change.
Suggested-by: Jan Beulich <jbeul...@suse.com>
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
Reviewed-by: Paul Durrant <paul.durr...@citrix.com>
Acked-by: Jan Beulich <jbeul...@suse.com>
---
Changes since v2:
- Constify the union instead of each individual field.
---
Cc: Andrew Cooper <andrew.coop...@citrix.com>
Cc: George Dunlap <george.dun...@eu.citrix.com>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
Cc: Jan Beulich <jbeul...@suse.com>
Cc: Julien Grall <julien.gr...@arm.com>
Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Cc: Stefano Stabellini <sstabell...@kernel.org>
Cc: Tim Deegan <t...@xen.org>
Cc: Wei Liu <w...@xen.org>
---
xen/drivers/vpci/header.c | 7 ++-----
xen/include/xen/pci.h | 12 +++++++++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c
index 94094f5579..258b91deed 100644
--- a/xen/drivers/vpci/header.c
+++ b/xen/drivers/vpci/header.c
@@ -461,9 +461,6 @@ static int init_bars(struct pci_dev *pdev)
unsigned int i, num_bars, rom_reg;
struct vpci_header *header = &pdev->vpci->header;
struct vpci_bar *bars = header->bars;
- pci_sbdf_t sbdf = {
- .sbdf = PCI_SBDF3(pdev->seg, pdev->bus, pdev->devfn),
- };
int rc;
switch ( pci_conf_read8(pdev->seg, pdev->bus, slot, func, PCI_HEADER_TYPE)
@@ -530,7 +527,7 @@ static int init_bars(struct pci_dev *pdev)
else
bars[i].type = VPCI_BAR_MEM32;
- rc = pci_size_mem_bar(sbdf, reg, &addr, &size,
+ rc = pci_size_mem_bar(pdev->sbdf, reg, &addr, &size,
(i == num_bars - 1) ? PCI_BAR_LAST : 0);
if ( rc < 0 )
{
@@ -560,7 +557,7 @@ static int init_bars(struct pci_dev *pdev)
}
/* Check expansion ROM. */
- rc = pci_size_mem_bar(sbdf, rom_reg, &addr, &size, PCI_BAR_ROM);
+ rc = pci_size_mem_bar(pdev->sbdf, rom_reg, &addr, &size, PCI_BAR_ROM);
if ( rc > 0 && size )
{
struct vpci_bar *rom = &header->bars[num_bars];
diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index c61fd7e262..b03927cd28 100644
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -81,9 +81,15 @@ struct pci_dev {
struct arch_msix *msix;
struct domain *domain;
- const u16 seg;
- const u8 bus;
- const u8 devfn;
+
+ const union {
+ struct {
+ uint8_t devfn;
+ uint8_t bus;
+ uint16_t seg;
+ };
+ pci_sbdf_t sbdf;
+ };
u8 phantom_stride;
--
2.20.1 (Apple Git-117)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
