[libvirt] [PATCH v13 25/49] rename qemu*USBDevices to virHostdev*USBDevices

Chunyan Liu cyliu at suse.com
Sat Mar 1 06:29:20 UTC 2014


Signed-off-by: Chunyan Liu <cyliu at suse.com>
---
 src/qemu/qemu_hostdev.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 1a589f4..15ed47c 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -247,9 +247,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;
@@ -304,9 +304,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;
@@ -428,7 +428,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) {
@@ -441,7 +441,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
      * and add them do driver list. However, if something goes
      * wrong, perform rollback.
      */
-    if (qemuPrepareHostdevUSBDevices(hostdev_mgr, dom_name, list) < 0)
+    if (virHostdevMarkUsbHostdevs(hostdev_mgr, dom_name, list) < 0)
         goto cleanup;
 
     /* Loop 2: Temporary list was successfully merged with
-- 
1.6.0.2




More information about the libvir-list mailing list