External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-22 22:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename qemu*USBDevices to virHostdev*USBDevices

Browse Source
This commit is contained in:
Chunyan Liu 2014-03-06 13:38:23 +08:00 committed by Daniel P. Berrange
parent b7508481f1
commit 27da1757c8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_hostdev.c
View File

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