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

libxl: allow vendor/product addressing for USB hostdevs

Browse Source 
libxl only has API to address the host USB devices by bus/device.
Find the bus/device if the user only provided the vendor/product
of the USB device.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Cédric Bosdonnat 2016-08-10 18:39:12 -06:00
parent ea46e00f12
commit e01d300bb1
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libxl/libxl_conf.c
View File

@ -1559,23 +1559,36 @@ int
libxlMakeUSB(virDomainHostdevDefPtr hostdev, libxl_device_usbdev *usbdev)
{
virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb;
virUSBDevicePtr usb = NULL;
int ret = -1;
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
return -1;
return ret;
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)
return -1;
return ret;
if (usbsrc->bus <= 0 || usbsrc->device <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("libxenlight supports only USB device "
"specified by busnum:devnum"));
return -1;
if (usbsrc->bus > 0 && usbsrc->device > 0) {
usbdev->u.hostdev.hostbus = usbsrc->bus;
usbdev->u.hostdev.hostaddr = usbsrc->device;
} else {
if (virHostdevFindUSBDevice(hostdev, true, &usb) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("failed to find USB device busnum:devnum "
"for %x:%x"),
usbsrc->vendor, usbsrc->product);
goto cleanup;
}
usbdev->u.hostdev.hostbus = virUSBDeviceGetBus(usb);
usbdev->u.hostdev.hostaddr = virUSBDeviceGetDevno(usb);
}
usbdev->u.hostdev.hostbus = usbsrc->bus;
usbdev->u.hostdev.hostaddr = usbsrc->device;
ret = 0;
return 0;
cleanup:
virUSBDeviceFree(usb);
return ret;
}
static int