From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlfQu-0003sV-2f for qemu-devel@nongnu.org; Fri, 13 Jan 2012 06:36:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RlfQi-0000bi-KE for qemu-devel@nongnu.org; Fri, 13 Jan 2012 06:36:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlfQh-0000bM-No for qemu-devel@nongnu.org; Fri, 13 Jan 2012 06:36:20 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0DBaI6b004456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Jan 2012 06:36:18 -0500 From: Gerd Hoffmann Date: Fri, 13 Jan 2012 11:18:30 +0100 Message-Id: <1326449914-8591-14-git-send-email-kraxel@redhat.com> In-Reply-To: <1326449914-8591-1-git-send-email-kraxel@redhat.com> References: <1326449914-8591-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 13/17] usb-redir: Clear iso / irq error when stopping the stream List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hans de Goede , Gerd Hoffmann From: Hans de Goede 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 Signed-off-by: Gerd Hoffmann --- 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