diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-11-21 17:21:02 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-05-26 08:41:07 +0200 |
| commit | 8d1bd3c901a315d0000b09b495fa9d5b87641bd9 (patch) | |
| tree | 6c982c4327ea6791e2bee50eb9fe95b654063cb4 /hw/usb | |
| parent | 56a9f180511cccbce943ee5c0b4c2e9cc7ccd800 (diff) | |
| download | qemu-8d1bd3c901a315d0000b09b495fa9d5b87641bd9.tar.gz | |
usb-host-libusb: Set stream id when submitting bulk-stream transfers
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/host-libusb.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 401eb7477e..8007d1d156 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -1214,10 +1214,23 @@ static void usb_host_handle_data(USBDevice *udev, USBPacket *p) usb_packet_copy(p, r->buffer, size); } ep = p->ep->nr | (r->in ? USB_DIR_IN : 0); - libusb_fill_bulk_transfer(r->xfer, s->dh, ep, - r->buffer, size, - usb_host_req_complete_data, r, - BULK_TIMEOUT); + if (p->stream) { +#if LIBUSBX_API_VERSION >= 0x01000103 + libusb_fill_bulk_stream_transfer(r->xfer, s->dh, ep, p->stream, + r->buffer, size, + usb_host_req_complete_data, r, + BULK_TIMEOUT); +#else + usb_host_req_free(r); + p->status = USB_RET_STALL; + return; +#endif + } else { + libusb_fill_bulk_transfer(r->xfer, s->dh, ep, + r->buffer, size, + usb_host_req_complete_data, r, + BULK_TIMEOUT); + } break; case USB_ENDPOINT_XFER_INT: r = usb_host_req_alloc(s, p, p->pid == USB_TOKEN_IN, p->iov.size); |