qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hans de Goede <hdegoede@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 10/10] usb-host-libusb: Set stream id when submitting bulk-stream transfers
Date: Mon, 26 May 2014 10:47:07 +0200	[thread overview]
Message-ID: <1401094027-5275-11-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1401094027-5275-1-git-send-email-kraxel@redhat.com>

From: Hans de Goede <hdegoede@redhat.com>

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/host-libusb.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 401eb74..8007d1d 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);
-- 
1.8.3.1

      parent reply	other threads:[~2014-05-26  8:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-26  8:46 [Qemu-devel] [PULL 00/10] usb queue: usb3 streams, xhci + mtp fixes Gerd Hoffmann
2014-05-26  8:46 ` [Qemu-devel] [PULL 01/10] xhci: child detach fix Gerd Hoffmann
2014-05-26  8:46 ` [Qemu-devel] [PULL 02/10] xhci: add endpoint cap on express bus only Gerd Hoffmann
2014-05-26  8:47 ` [Qemu-devel] [PULL 03/10] xhci: add xhci_get_flag Gerd Hoffmann
2014-05-26  8:47 ` [Qemu-devel] [PULL 04/10] usb-mtp: use bool to track MTPObject init status Gerd Hoffmann
2014-05-26  8:47 ` [Qemu-devel] [PULL 05/10] usb-mtp: handle lseek failure Gerd Hoffmann
2014-05-26  8:47 ` [Qemu-devel] [PULL 06/10] usb-mtp: handle usb_mtp_get_object failure Gerd Hoffmann
2014-05-26  8:47 ` [Qemu-devel] [PULL 07/10] usb-redir: Add support for bulk streams Gerd Hoffmann
2014-05-26  8:47 ` [Qemu-devel] [PULL 08/10] usb-host-libusb: Fill in endpoint max_streams when available Gerd Hoffmann
2014-05-26  8:47 ` [Qemu-devel] [PULL 09/10] usb-host-libusb: Add alloc / free streams ops Gerd Hoffmann
2014-05-26  8:47 ` Gerd Hoffmann [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401094027-5275-11-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=hdegoede@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).