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

src/qemu/qemu_hostdev.c

index bb3dc69af1714ab7053f046f668da7cb1378da10..25a34e8151e298b3faab70f79b07c16ea2526462 100644 (file)
@@ -377,19 +377,17 @@ out:
     return 0;
 }
 
-
-int
-qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
-                          const char *name,
-                          virDomainHostdevDefPtr *hostdevs,
-                          int nhostdevs,
-                          unsigned int flags)
+static int
+virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
+                            const char *name,
+                            virDomainHostdevDefPtr *hostdevs,
+                            int nhostdevs,
+                            unsigned int flags)
 {
     size_t i;
     int ret = -1;
     virUSBDeviceListPtr list;
     virUSBDevicePtr tmp;
-    virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
     bool coldBoot = !!(flags & VIR_HOSTDEV_COLD_BOOT);
 
     /* To prevent situation where USB device is assigned to two domains
@@ -449,6 +447,19 @@ cleanup:
     return ret;
 }
 
+int
+qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
+                          const char *name,
+                          virDomainHostdevDefPtr *hostdevs,
+                          int nhostdevs,
+                          unsigned int flags)
+{
+    virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
+
+    return virHostdevPrepareUSBDevices(hostdev_mgr, name,
+                                       hostdevs, nhostdevs, flags);
+}
+
 
 int
 qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,