From 9315779031ac40aa6682ad9cac5a02f8f6d67032 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 29 Feb 2012 12:39:22 +0100 Subject: [PATCH 07/35] usb-redir: Pre-fill our isoc input buffer before sending pkts to the host RH-Author: Gerd Hoffmann Message-id: <1330519171-24231-8-git-send-email-kraxel@redhat.com> Patchwork-id: 37774 O-Subject: [RHEL-6.3 qemu-kvm PATCH v2 07/16] usb-redir: Pre-fill our isoc input buffer before sending pkts to the host Bugzilla: 758104 RH-Acked-by: Paolo Bonzini RH-Acked-by: Markus Armbruster RH-Acked-by: Alex Williamson From: Hans de Goede This is something which should have been done from the first version of usb-redir, but wasn't. Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann (cherry picked from commit e15378847919144b99ead1587a54168f1dd3ddf9) --- usb-redir.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) Signed-off-by: Michal Novotny --- usb-redir.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/usb-redir.c b/usb-redir.c index c11ab08..4d10d25 100644 --- a/usb-redir.c +++ b/usb-redir.c @@ -60,7 +60,9 @@ struct endp_data { uint8_t iso_error; /* For reporting iso errors to the HC */ uint8_t interrupt_started; uint8_t interrupt_error; + uint8_t bufpq_prefilled; QTAILQ_HEAD(, buf_packet) bufpq; + int bufpq_size; int bufpq_target_size; }; @@ -296,6 +298,7 @@ static struct buf_packet *bufp_alloc(USBRedirDevice *dev, bufp->len = len; bufp->status = status; QTAILQ_INSERT_TAIL(&dev->endpoint[EP2I(ep)].bufpq, bufp, next); + dev->endpoint[EP2I(ep)].bufpq_size++; return bufp; } @@ -303,6 +306,7 @@ static void bufp_free(USBRedirDevice *dev, struct buf_packet *bufp, uint8_t ep) { QTAILQ_REMOVE(&dev->endpoint[EP2I(ep)].bufpq, bufp, next); + dev->endpoint[EP2I(ep)].bufpq_size--; free(bufp->data); qemu_free(bufp); } @@ -374,14 +378,26 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, usbredirparser_do_write(dev->parser); DPRINTF("iso stream started ep %02X\n", ep); dev->endpoint[EP2I(ep)].iso_started = 1; + dev->endpoint[EP2I(ep)].bufpq_prefilled = 0; } if (ep & USB_DIR_IN) { struct buf_packet *isop; + if (dev->endpoint[EP2I(ep)].iso_started && + !dev->endpoint[EP2I(ep)].bufpq_prefilled) { + if (dev->endpoint[EP2I(ep)].bufpq_size < + dev->endpoint[EP2I(ep)].bufpq_target_size) { + return usbredir_handle_status(dev, 0, 0); + } + dev->endpoint[EP2I(ep)].bufpq_prefilled = 1; + } + isop = QTAILQ_FIRST(&dev->endpoint[EP2I(ep)].bufpq); if (isop == NULL) { DPRINTF2("iso-token-in ep %02X, no isop\n", ep); + /* Re-fill the buffer */ + dev->endpoint[EP2I(ep)].bufpq_prefilled = 0; /* Check iso_error for stream errors, otherwise its an underrun */ status = dev->endpoint[EP2I(ep)].iso_error; dev->endpoint[EP2I(ep)].iso_error = 0; -- 1.7.7.6