External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

pass driver name to virHostdevPrepareUSBDevices

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

8
src/qemu/qemu_hostdev.c
View File

@ -235,6 +235,7 @@ out:
static int static int
virHostdevMarkUsbHostdevs(virHostdevManagerPtr mgr, virHostdevMarkUsbHostdevs(virHostdevManagerPtr mgr,
const char *drv_name,
const char *name, const char *name,
virUSBDeviceListPtr list) virUSBDeviceListPtr list)
{ {
@ -265,7 +266,7 @@ virHostdevMarkUsbHostdevs(virHostdevManagerPtr mgr,
goto error; goto error;
} }
virUSBDeviceSetUsedBy(usb, QEMU_DRIVER_NAME, name); virUSBDeviceSetUsedBy(usb, drv_name, name);
VIR_DEBUG("Adding %03d.%03d dom=%s to activeUsbHostdevs", VIR_DEBUG("Adding %03d.%03d dom=%s to activeUsbHostdevs",
virUSBDeviceGetBus(usb), virUSBDeviceGetDevno(usb), name); virUSBDeviceGetBus(usb), virUSBDeviceGetDevno(usb), name);
/* /*
@ -379,6 +380,7 @@ out:
static int static int
virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr, virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
const char *drv_name,
const char *name, const char *name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs, int nhostdevs,
@ -428,7 +430,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 (virHostdevMarkUsbHostdevs(hostdev_mgr, name, list) < 0) if (virHostdevMarkUsbHostdevs(hostdev_mgr, drv_name, name, list) < 0)
goto cleanup; goto cleanup;
/* Loop 2: Temporary list was successfully merged with /* Loop 2: Temporary list was successfully merged with
@ -456,7 +458,7 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
{ {
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
return virHostdevPrepareUSBDevices(hostdev_mgr, name, return virHostdevPrepareUSBDevices(hostdev_mgr, QEMU_DRIVER_NAME, name,
hostdevs, nhostdevs, flags); hostdevs, nhostdevs, flags);
} }