qemu: Stop virQEMUCaps propagation into qemuHostdevPreparePCIDevices()

After previous cleanups, qemuHostdevPreparePCIDevices() no longer
needs virQEMUCaps. Drop its passing from callers.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 49347019eac5fd63bffed8d01c807512e2d508ea..f329442f8cfcac5072a5bc91781022922d6f8ce4 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -181,7 +181,6 @@ qemuHostdevPreparePCIDevices(virQEMUDriver *driver,
                              const unsigned char *uuid,
                              virDomainHostdevDef **hostdevs,
                              int nhostdevs,
-                             virQEMUCaps *qemuCaps G_GNUC_UNUSED,
                              unsigned int flags)
 {
     return virHostdevPreparePCIDevices(driver->hostdevMgr,
@@ -261,7 +260,6 @@ qemuHostdevPrepareMediatedDevices(virQEMUDriver *driver,
 int
 qemuHostdevPrepareDomainDevices(virQEMUDriver *driver,
                                 virDomainDef *def,
-                                virQEMUCaps *qemuCaps,
                                 unsigned int flags)
 {
     if (!def->nhostdevs && !def->ndisks)
@@ -271,8 +269,7 @@ qemuHostdevPrepareDomainDevices(virQEMUDriver *driver,
         return -1;
 
     if (qemuHostdevPreparePCIDevices(driver, def->name, def->uuid,
-                                     def->hostdevs, def->nhostdevs,
-                                     qemuCaps, flags) < 0)
+                                     def->hostdevs, def->nhostdevs, flags) < 0)
         return -1;
 
     if (qemuHostdevPrepareUSBDevices(driver, def->name,

diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h
index 2d484db878dd4cb126d8d83f09881e0f5fa3d30e..3e9adc57a9ec9845f4e2b5322066c792c9b1d777 100644 (file)
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@@ -52,7 +52,6 @@ int qemuHostdevPreparePCIDevices(virQEMUDriver *driver,
                                  const unsigned char *uuid,
                                  virDomainHostdevDef **hostdevs,
                                  int nhostdevs,
-                                 virQEMUCaps *qemuCaps,
                                  unsigned int flags);
 int qemuHostdevPrepareUSBDevices(virQEMUDriver *driver,
                                  const char *name,
@@ -73,7 +72,6 @@ int qemuHostdevPrepareMediatedDevices(virQEMUDriver *driver,
                                       int nhostdevs);
 int qemuHostdevPrepareDomainDevices(virQEMUDriver *driver,
                                     virDomainDef *def,
-                                    virQEMUCaps *qemuCaps,
                                     unsigned int flags);
 
 void qemuHostdevReAttachOneNVMeDisk(virQEMUDriver *driver,

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 7dced9ce0f118a2d6ace0c51079e13c168db184c..8c1454027513521e39644a1b6db81060beafb4db 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1490,8 +1490,8 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
 
     if (!cfg->relaxedACS)
         flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;
-    if (qemuHostdevPreparePCIDevices(driver, vm->def->name, vm->def->uuid,
-                                     &hostdev, 1, priv->qemuCaps, flags) < 0)
+    if (qemuHostdevPreparePCIDevices(driver, vm->def->name,
+                                     vm->def->uuid, &hostdev, 1, flags) < 0)
         return -1;
 
     if (qemuDomainAdjustMaxMemLockHostdev(vm, hostdev) < 0)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index c2bacfab8f43a4968ace986ab6649b8d958ec5c4..952814d6637fecccba328d64c66e8bde5a0c763c 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7164,8 +7164,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
         hostdev_flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;
     if (flags & VIR_QEMU_PROCESS_START_NEW)
         hostdev_flags |= VIR_HOSTDEV_COLD_BOOT;
-    if (qemuHostdevPrepareDomainDevices(driver, vm->def, priv->qemuCaps,
-                                        hostdev_flags) < 0)
+    if (qemuHostdevPrepareDomainDevices(driver, vm->def, hostdev_flags) < 0)
         return -1;
 
     VIR_DEBUG("Preparing chr device backends");