From patchwork Tue Jan 10 13:13:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 135426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B6F94B6EFF for ; Thu, 12 Jan 2012 03:36:53 +1100 (EST) Received: from localhost ([::1]:46477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkzhD-0006IF-FM for incoming@patchwork.ozlabs.org; Wed, 11 Jan 2012 10:02:35 -0500 Received: from eggs.gnu.org ([140.186.70.92]:60357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkbUn-0004cM-Jw for qemu-devel@nongnu.org; Tue, 10 Jan 2012 08:12:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RkbUe-000062-3l for qemu-devel@nongnu.org; Tue, 10 Jan 2012 08:12:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkbUd-00005w-TU for qemu-devel@nongnu.org; Tue, 10 Jan 2012 08:12:00 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0ADBwRR014491 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 10 Jan 2012 08:11:58 -0500 Received: from shalem.localdomain.com (vpn1-5-237.ams2.redhat.com [10.36.5.237]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q0ADBv5N003302; Tue, 10 Jan 2012 08:11:57 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Tue, 10 Jan 2012 14:13:04 +0100 Message-Id: <1326201188-13478-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 X-Mailman-Approved-At: Wed, 11 Jan 2012 10:01:15 -0500 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/5] usb-redir: Clear iso / irq error when stopping the stream X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- usb-redir.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/usb-redir.c b/usb-redir.c index fb91c92..7678f1a 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; }