qemu_process: Refactor qemuProcessOpenVfioDeviceFd

This will allow us reusing same code for hotplug support.
As part of refactor remove redundant checks.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index cc2a9c8abc645dae15f94eccd8f7a85903dfa78e..2bab46fca69eb09a15a942293e8a2c1b6355abc1 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7702,23 +7702,21 @@ qemuProcessOpenIommuFd(virDomainObj *vm)
 /**
  * qemuProcessOpenVfioDeviceFd:
  * @hostdev: host device definition
- * @vfioFd: returned file descriptor
  *
  * Opens the VFIO device file descriptor for a hostdev.
  *
- * Returns: FD on success, -1 on failure
+ * Returns: 0 on success, -1 on failure
  */
 static int
 qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev)
 {
-    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
-        hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("VFIO FD only supported for PCI hostdevs"));
+    qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
+    virDomainHostdevSubsysPCI *pci = &hostdev->source.subsys.u.pci;
+
+    if ((hostdevPriv->vfioDeviceFd = virPCIDeviceOpenVfioFd(&pci->addr)) < 0)
         return -1;
-    }
 
-    return virPCIDeviceOpenVfioFd(&hostdev->source.subsys.u.pci.addr);
+    return 0;
 }
 
 /**
@@ -7737,16 +7735,14 @@ qemuProcessOpenVfioFds(virDomainObj *vm)
     /* Check if we have any hostdevs that need VFIO FDs */
     for (i = 0; i < vm->def->nhostdevs; i++) {
         virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
-        qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev);
 
         if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
             hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
             hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
             hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
             /* Open VFIO device FD */
-            hostdevPriv->vfioDeviceFd = qemuProcessOpenVfioDeviceFd(hostdev);
-            if (hostdevPriv->vfioDeviceFd == -1)
-                 return -1;
+            if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
+                return -1;
 
             /* Open IOMMU FD */
             if (qemuProcessOpenIommuFd(vm) < 0)