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] [PATCH 13/17] usb-redir: Clear iso / irq error when stopping the stream
Date: Fri, 13 Jan 2012 11:18:30 +0100 [thread overview]
Message-ID: <1326449914-8591-14-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1326449914-8591-1-git-send-email-kraxel@redhat.com>
From: Hans de Goede <hdegoede@redhat.com>
And ignore status messages from the client which arrive after stream
stop (the stream stop send to the client and an error status reported by
the client my cross each other due to network latency).
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
usb-redir.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/usb-redir.c b/usb-redir.c
index 2b53cf3..81a35c6 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -410,6 +410,7 @@ static void usbredir_stop_iso_stream(USBRedirDevice *dev, uint8_t ep)
DPRINTF("iso stream stopped ep %02X\n", ep);
dev->endpoint[EP2I(ep)].iso_started = 0;
}
+ dev->endpoint[EP2I(ep)].iso_error = 0;
usbredir_free_bufpq(dev, ep);
}
@@ -522,6 +523,7 @@ static void usbredir_stop_interrupt_receiving(USBRedirDevice *dev,
DPRINTF("interrupt recv stopped ep %02X\n", ep);
dev->endpoint[EP2I(ep)].interrupt_started = 0;
}
+ dev->endpoint[EP2I(ep)].interrupt_error = 0;
usbredir_free_bufpq(dev, ep);
}
@@ -1029,7 +1031,7 @@ static void usbredir_iso_stream_status(void *priv, uint32_t id,
DPRINTF("iso status %d ep %02X id %u\n", iso_stream_status->status,
ep, id);
- if (!dev->dev.attached) {
+ if (!dev->dev.attached || !dev->endpoint[EP2I(ep)].iso_started) {
return;
}
@@ -1050,7 +1052,7 @@ static void usbredir_interrupt_receiving_status(void *priv, uint32_t id,
DPRINTF("interrupt recv status %d ep %02X id %u\n",
interrupt_receiving_status->status, ep, id);
- if (!dev->dev.attached) {
+ if (!dev->dev.attached || !dev->endpoint[EP2I(ep)].interrupt_started) {
return;
}
--
1.7.1
next prev parent reply other threads:[~2012-01-13 11:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-13 10:18 [Qemu-devel] [PULL 00/17] usb patch queue: audio, xhci, usbredir Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 01/17] usb-host: rip out legacy procfs support Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 02/17] usb: track configuration and interface count in USBDevice Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 03/17] usb: track altsetting " Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 04/17] usb-desc: audio endpoint support Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 05/17] usb: add audio device model Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 06/17] xhci: Initial xHCI implementation Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 07/17] usb: add USBEndpoint Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 08/17] usb: add ifnum to USBEndpoint Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 09/17] usb-desc: USBEndpoint support Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 10/17] usb/debug: add usb_ep_dump Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 11/17] usb: add max_packet_size to USBEndpoint Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 12/17] usb: link packets to endpoints not devices Gerd Hoffmann
2012-01-13 10:18 ` Gerd Hoffmann [this message]
2012-01-13 10:18 ` [Qemu-devel] [PATCH 14/17] usb-redir: Dynamically adjust iso buffering size based on ep interval Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 15/17] usb-redir: Pre-fill our isoc input buffer before sending pkts to the host Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 16/17] usb-redir: Try to keep our buffer size near the target size Gerd Hoffmann
2012-01-13 10:18 ` [Qemu-devel] [PATCH 17/17] usb-redir: Improve some debugging messages Gerd Hoffmann
2012-01-13 15:19 ` [Qemu-devel] [PULL 00/17] usb patch queue: audio, xhci, usbredir Anthony Liguori
2012-01-17 9:06 ` Gerd Hoffmann
2012-01-19 18:48 ` Anthony Liguori
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=1326449914-8591-14-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).