qemu: hostdev: Introduce qemuHostdevUpdateActiveDomainDevices()

This calls the PCI-, USB- and SCSI-specific functions just
like qemuHostdev{Prepare,ReAttach}DomainDevices() already do,
and was the missing piece for the qemuHostdev API to nicely
mirror the virHostdev API.

Update qemuProcessReconnect() to use the new function.

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 7c920c9c67bfa1ff896cb2a15088a6be1005f405..ca38a064a7ade47034c1489a3bb53d60d4cf0921 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -83,6 +83,24 @@ qemuHostdevUpdateActiveSCSIDevices(virQEMUDriverPtr driver,
                                              QEMU_DRIVER_NAME, def->name);
 }
 
+int
+qemuHostdevUpdateActiveDomainDevices(virQEMUDriverPtr driver,
+                                     virDomainDefPtr def)
+{
+    if (!def->nhostdevs)
+        return 0;
+
+    if (qemuHostdevUpdateActivePCIDevices(driver, def) < 0)
+        return -1;
+
+    if (qemuHostdevUpdateActiveUSBDevices(driver, def) < 0)
+        return -1;
+
+    if (qemuHostdevUpdateActiveSCSIDevices(driver, def) < 0)
+        return -1;
+
+    return 0;
+}
 
 bool
 qemuHostdevHostSupportsPassthroughVFIO(void)

diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h
index c1a0a57f950f87af3a3b0ae5bde419e4b8bbb0c4..0a3c715998e00eae341ab875df6fb7a7e555c34e 100644 (file)
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@@ -36,6 +36,8 @@ int qemuHostdevUpdateActiveUSBDevices(virQEMUDriverPtr driver,
                                       virDomainDefPtr def);
 int qemuHostdevUpdateActiveSCSIDevices(virQEMUDriverPtr driver,
                                        virDomainDefPtr def);
+int qemuHostdevUpdateActiveDomainDevices(virQEMUDriverPtr driver,
+                                         virDomainDefPtr def);
 
 int qemuHostdevPreparePCIDevices(virQEMUDriverPtr driver,
                                  const char *name,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6f3214e48f888bcb4e12cef929633da02bfc12f4..f7444196af9c73dd6a41112cbb79f3a31eb8cc8d 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3769,13 +3769,7 @@ qemuProcessReconnect(void *opaque)
         priv->agentError = true;
     }
 
-    if (qemuHostdevUpdateActivePCIDevices(driver, obj->def) < 0)
-        goto error;
-
-    if (qemuHostdevUpdateActiveUSBDevices(driver, obj->def) < 0)
-        goto error;
-
-    if (qemuHostdevUpdateActiveSCSIDevices(driver, obj->def) < 0)
+    if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0)
         goto error;
 
     if (qemuConnectCgroup(driver, obj) < 0)