[PATCH v3 06/18] pci: Use pci_sbdf_t in pci_hide_device()

[Teddy Astie <teddy.astie@xxxxxxxxxx>]

No functional change intended.

Signed-off-by: Teddy Astie <teddy.astie@xxxxxxxxxx>
Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/drivers/char/ehci-dbgp.c  | 2 +-
 xen/drivers/char/xhci-dbc.c   | 2 +-
 xen/drivers/passthrough/pci.c | 7 +++----
 xen/drivers/video/vga.c       | 2 +-
 xen/include/xen/pci.h         | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
index 2a58213cab..ab1e3c6de4 100644
--- a/xen/drivers/char/ehci-dbgp.c
+++ b/xen/drivers/char/ehci-dbgp.c
@@ -1376,7 +1376,7 @@ static void __init cf_check ehci_dbgp_init_postirq(struct 
serial_port *port)
 
     ehci_dbgp_setup_postirq(dbgp);
 
-    pci_hide_device(0, dbgp->bus, PCI_DEVFN(dbgp->slot, dbgp->func));
+    pci_hide_device(PCI_SBDF(0, dbgp->bus, dbgp->slot, dbgp->func));
 }
 
 static int ehci_dbgp_check_release(struct ehci_dbgp *dbgp)
diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c
index 7a56dca6dd..3f41aa7022 100644
--- a/xen/drivers/char/xhci-dbc.c
+++ b/xen/drivers/char/xhci-dbc.c
@@ -1202,7 +1202,7 @@ static void __init cf_check dbc_uart_init_postirq(struct 
serial_port *port)
                    &uart->dbc.sbdf);
         break;
     case XHCI_SHARE_HWDOM:
-        if ( pci_hide_device(0, uart->dbc.sbdf.bus, uart->dbc.sbdf.devfn) )
+        if ( pci_hide_device(uart->dbc.sbdf) )
             printk(XENLOG_WARNING
                    "Failed to hide %pp used for XHCI console\n",
                    &uart->dbc.sbdf);
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index e4357b84a4..8c574926cd 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -476,18 +476,17 @@ static void __init _pci_hide_device(struct pci_dev *pdev)
     write_unlock(&dom_xen->pci_lock);
 }
 
-int __init pci_hide_device(unsigned int seg, unsigned int bus,
-                           unsigned int devfn)
+int __init pci_hide_device(pci_sbdf_t sbdf)
 {
     struct pci_dev *pdev;
     struct pci_seg *pseg;
     int rc = -ENOMEM;
 
     pcidevs_lock();
-    pseg = alloc_pseg(seg);
+    pseg = alloc_pseg(sbdf.seg);
     if ( pseg )
     {
-        pdev = alloc_pdev(pseg, bus, devfn);
+        pdev = alloc_pdev(pseg, sbdf.bus, sbdf.devfn);
         if ( pdev )
         {
             _pci_hide_device(pdev);
diff --git a/xen/drivers/video/vga.c b/xen/drivers/video/vga.c
index b577b24619..b2b9c3680a 100644
--- a/xen/drivers/video/vga.c
+++ b/xen/drivers/video/vga.c
@@ -147,7 +147,7 @@ void __init video_endboot(void)
                 {
                     printk(XENLOG_INFO "Boot video device %02x:%02x.%u\n",
                            bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
-                    pci_hide_device(0, bus, devfn);
+                    pci_hide_device(PCI_SBDF(0, bus, devfn));
                 }
             }
     }
diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index d038217607..03ae389cb7 100644
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -233,7 +233,7 @@ int pci_add_device(pci_sbdf_t sbdf, const struct 
pci_dev_info *info,
                    nodeid_t node);
 int pci_remove_device(pci_sbdf_t sbdf);
 int pci_ro_device(pci_sbdf_t sbdf);
-int pci_hide_device(unsigned int seg, unsigned int bus, unsigned int devfn);
+int pci_hide_device(pci_sbdf_t sbdf);
 struct pci_dev *pci_get_pdev(const struct domain *d, pci_sbdf_t sbdf);
 struct pci_dev *pci_get_real_pdev(pci_sbdf_t sbdf);
 void pci_check_disable_device(u16 seg, u8 bus, u8 devfn);
-- 
2.54.0



--
Teddy Astie | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech