提交 b2c7b9ee 编写于 作者: M Michal Privoznik

qemu: Don't leak temporary list of USB devices

and add debug message when adding USB device
to the list of active devices.
上级 cf2ed25c
...@@ -559,10 +559,7 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, ...@@ -559,10 +559,7 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver,
hostdev->source.subsys.u.usb.product); hostdev->source.subsys.u.usb.product);
if (!usb) if (!usb)
return -1; goto cleanup;
hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb);
hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb);
if ((tmp = usbDeviceListFind(driver->activeUsbHostdevs, usb))) { if ((tmp = usbDeviceListFind(driver->activeUsbHostdevs, usb))) {
const char *other_name = usbDeviceGetUsedBy(tmp); const char *other_name = usbDeviceGetUsedBy(tmp);
...@@ -579,6 +576,9 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, ...@@ -579,6 +576,9 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver,
goto cleanup; goto cleanup;
} }
hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb);
hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb);
if (usbDeviceListAdd(list, usb) < 0) { if (usbDeviceListAdd(list, usb) < 0) {
usbFreeDevice(usb); usbFreeDevice(usb);
goto cleanup; goto cleanup;
...@@ -594,6 +594,9 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, ...@@ -594,6 +594,9 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver,
for (i = 0; i < usbDeviceListCount(list); i++) { for (i = 0; i < usbDeviceListCount(list); i++) {
tmp = usbDeviceListGet(list, i); tmp = usbDeviceListGet(list, i);
usbDeviceSetUsedBy(tmp, name); usbDeviceSetUsedBy(tmp, name);
VIR_DEBUG("Adding %03d.%03d dom=%s to activeUsbHostdevs",
usbDeviceGetBus(tmp), usbDeviceGetDevno(tmp), name);
if (usbDeviceListAdd(driver->activeUsbHostdevs, tmp) < 0) { if (usbDeviceListAdd(driver->activeUsbHostdevs, tmp) < 0) {
usbFreeDevice(tmp); usbFreeDevice(tmp);
goto inactivedevs; goto inactivedevs;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册