extract general code from qemuUpdateActiveUsbHostdevs

Extract general code from qemuUpdateActiveUsbHostdevs to
virHostdevUpdateActiveUsbHostdevs.

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index b52f7acd043802171c9f1afd0be2095de5ded227..b6ee4048a5ced5f56a81cfb1400f185f2c0fc736 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -111,17 +111,13 @@ qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
     return virHostdevUpdateActivePciHostdevs(mgr, def);
 }
 
-int
-qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
-                            virDomainDefPtr def)
+static int
+virHostdevUpdateActiveUsbHostdevs(virHostdevManagerPtr mgr,
+                                  virDomainDefPtr def)
 {
     virDomainHostdevDefPtr hostdev = NULL;
     size_t i;
     int ret = -1;
-    virHostdevManagerPtr mgr = driver->hostdevMgr;
-
-    if (!def->nhostdevs)
-        return 0;
 
     virObjectLock(mgr->activeUsbHostdevs);
     for (i = 0; i < def->nhostdevs; i++) {
@@ -157,6 +153,18 @@ cleanup:
     return ret;
 }
 
+int
+qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
+                            virDomainDefPtr def)
+{
+    virHostdevManagerPtr mgr = driver->hostdevMgr;
+
+    if (!def->nhostdevs)
+        return 0;
+
+    return virHostdevUpdateActiveUsbHostdevs(mgr, def);
+}
+
 int
 qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver,
                              virDomainDefPtr def)