david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb-host: add option to allow all resets.

Browse Source 
Commit 65f14ab98da1 ("usb-host: skip reset for untouched devices")
filters out multiple usb device resets in a row.  While this improves
the situation for usb some devices it doesn't work for others :-(

So go add a config option to make the behavior configurable.

Buglink: https://bugs.launchpad.net/bugs/1846451
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20191015064426.19454-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-10-15 08:44:26 +02:00
parent 412fbef3d0
commit 1dfe2b91dc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/usb/host-libusb.c
View File

@ -86,7 +86,9 @@ struct USBHostDevice {
uint32_t options; uint32_t options;
uint32_t loglevel; uint32_t loglevel;
bool needs_autoscan; bool needs_autoscan;
bool allow_guest_reset; bool allow_one_guest_reset;
bool allow_all_guest_resets;
/* state */ /* state */
QTAILQ_ENTRY(USBHostDevice) next; QTAILQ_ENTRY(USBHostDevice) next;
int seen, errcount; int seen, errcount;
@ -1462,10 +1464,10 @@ static void usb_host_handle_reset(USBDevice *udev)
USBHostDevice *s = USB_HOST_DEVICE(udev); USBHostDevice *s = USB_HOST_DEVICE(udev);
int rc; int rc;
if (!s->allow_guest_reset) { if (!s->allow_one_guest_reset && !s->allow_all_guest_resets) {
return; return;
} }
if (udev->addr == 0) { if (!s->allow_all_guest_resets && udev->addr == 0) {
return; return;
} }
@ -1586,7 +1588,10 @@ static Property usb_host_dev_properties[] = {
DEFINE_PROP_UINT32("productid", USBHostDevice, match.product_id, 0), DEFINE_PROP_UINT32("productid", USBHostDevice, match.product_id, 0),
DEFINE_PROP_UINT32("isobufs", USBHostDevice, iso_urb_count, 4), DEFINE_PROP_UINT32("isobufs", USBHostDevice, iso_urb_count, 4),
DEFINE_PROP_UINT32("isobsize", USBHostDevice, iso_urb_frames, 32), DEFINE_PROP_UINT32("isobsize", USBHostDevice, iso_urb_frames, 32),
DEFINE_PROP_BOOL("guest-reset", USBHostDevice, allow_guest_reset, true), DEFINE_PROP_BOOL("guest-reset", USBHostDevice,
allow_one_guest_reset, true),
DEFINE_PROP_BOOL("guest-resets-all", USBHostDevice,
allow_all_guest_resets, false),
DEFINE_PROP_UINT32("loglevel", USBHostDevice, loglevel, DEFINE_PROP_UINT32("loglevel", USBHostDevice, loglevel,
LIBUSB_LOG_LEVEL_WARNING), LIBUSB_LOG_LEVEL_WARNING),
DEFINE_PROP_BIT("pipeline", USBHostDevice, options, DEFINE_PROP_BIT("pipeline", USBHostDevice, options,