]> xenbits.xensource.com Git - libvirt.git/commitdiff
rename qemu*USBDevices to virHostdev*USBDevices
authorChunyan Liu <cyliu@suse.com>
Thu, 6 Mar 2014 05:38:23 +0000 (13:38 +0800)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 12 Mar 2014 16:03:05 +0000 (16:03 +0000)
src/qemu/qemu_hostdev.c

index 25a34e8151e298b3faab70f79b07c16ea2526462..b72e9f991c859c688378112699ff7ea75161e0f5 100644 (file)
@@ -234,9 +234,9 @@ out:
 
 
 static int
-qemuPrepareHostdevUSBDevices(virHostdevManagerPtr mgr,
-                             const char *name,
-                             virUSBDeviceListPtr list)
+virHostdevMarkUsbHostdevs(virHostdevManagerPtr mgr,
+                          const char *name,
+                          virUSBDeviceListPtr list)
 {
     size_t i, j;
     unsigned int count;
@@ -291,9 +291,9 @@ error:
 
 
 static int
-qemuFindHostdevUSBDevice(virDomainHostdevDefPtr hostdev,
-                         bool mandatory,
-                         virUSBDevicePtr *usb)
+virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev,
+                        bool mandatory,
+                        virUSBDevicePtr *usb)
 {
     unsigned vendor = hostdev->source.subsys.u.usb.vendor;
     unsigned product = hostdev->source.subsys.u.usb.product;
@@ -415,7 +415,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
              !coldBoot))
             required = false;
 
-        if (qemuFindHostdevUSBDevice(hostdev, required, &usb) < 0)
+        if (virHostdevFindUSBDevice(hostdev, required, &usb) < 0)
             goto cleanup;
 
         if (usb && virUSBDeviceListAdd(list, usb) < 0) {
@@ -428,7 +428,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
      * and add them do driver list. However, if something goes
      * wrong, perform rollback.
      */
-    if (qemuPrepareHostdevUSBDevices(hostdev_mgr, name, list) < 0)
+    if (virHostdevMarkUsbHostdevs(hostdev_mgr, name, list) < 0)
         goto cleanup;
 
     /* Loop 2: Temporary list was successfully merged with