]> xenbits.xensource.com Git - libvirt.git/commitdiff
extract general code from qemuUpdateActiveScsiHostdevs
authorChunyan Liu <cyliu@suse.com>
Thu, 6 Mar 2014 04:47:50 +0000 (12:47 +0800)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 12 Mar 2014 16:03:05 +0000 (16:03 +0000)
Extract general code from qemuUpdateActiveScsiHostdevs to
virHostdevUpdateActiveScsiHostdevs

src/qemu/qemu_hostdev.c

index b6ee4048a5ced5f56a81cfb1400f185f2c0fc736..24ebb6029cd3df8a2c655e9a822925b0de333e7f 100644 (file)
@@ -165,19 +165,15 @@ qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
     return virHostdevUpdateActiveUsbHostdevs(mgr, def);
 }
 
-int
-qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver,
-                             virDomainDefPtr def)
+static int
+virHostdevUpdateActiveScsiHostdevs(virHostdevManagerPtr mgr,
+                                   virDomainDefPtr def)
 {
     virDomainHostdevDefPtr hostdev = NULL;
     size_t i;
     int ret = -1;
     virSCSIDevicePtr scsi = NULL;
     virSCSIDevicePtr tmp = NULL;
-    virHostdevManagerPtr mgr = driver->hostdevMgr;
-
-    if (!def->nhostdevs)
-        return 0;
 
     virObjectLock(mgr->activeScsiHostdevs);
     for (i = 0; i < def->nhostdevs; i++) {
@@ -217,6 +213,18 @@ cleanup:
     return ret;
 }
 
+int
+qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver,
+                             virDomainDefPtr def)
+{
+    virHostdevManagerPtr mgr = driver->hostdevMgr;
+
+    if (!def->nhostdevs)
+        return 0;
+
+    return virHostdevUpdateActiveScsiHostdevs(mgr, def);
+}
+
 
 bool
 qemuHostdevHostSupportsPassthroughVFIO(void)