From patchwork Thu Oct 18 14:08:56 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: 192330 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A58692C008F for ; Fri, 19 Oct 2012 01:07:52 +1100 (EST) Received: from localhost ([::1]:50078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOqlK-00005a-M3 for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 10:07:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOqky-0008U0-LA for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:07:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOqkt-0002hn-R4 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:07:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOqkt-0002hg-Hq for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:07:23 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9IE7NPU018748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Oct 2012 10:07:23 -0400 Received: from shalem.localdomain.com (vpn1-4-74.ams2.redhat.com [10.36.4.74]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9IE7KBP002382; Thu, 18 Oct 2012 10:07:22 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Thu, 18 Oct 2012 16:08:56 +0200 Message-Id: <1350569339-2811-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1350569339-2811-1-git-send-email-hdegoede@redhat.com> References: <1350569339-2811-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/4] usb: Enforce iso endpoints never returing USB_RET_ASYNC 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 ehci was already testing for this, and we depend in various places on no devices doing this, so lets move the check for this to the usb core. Signed-off-by: Hans de Goede --- hw/usb/core.c | 1 + hw/usb/hcd-ehci.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 34a65af..4f4adaa 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -394,6 +394,7 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p) if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) { ret = usb_process_one(p); if (ret == USB_RET_ASYNC) { + assert(p->ep->type != USB_ENDPOINT_XFER_ISOC); usb_packet_set_state(p, USB_PACKET_ASYNC); QTAILQ_INSERT_TAIL(&p->ep->queue, p, queue); } else if (ret == USB_RET_ADD_TO_QUEUE) { diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 70b6363..534e1ed 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1667,7 +1667,6 @@ static int ehci_process_itd(EHCIState *ehci, (itd->transact[i] & ITD_XACT_IOC) != 0); usb_packet_map(&ehci->ipacket, &ehci->isgl); ret = usb_handle_packet(dev, &ehci->ipacket); - assert(ret != USB_RET_ASYNC); usb_packet_unmap(&ehci->ipacket, &ehci->isgl); } else { DPRINTF("ISOCH: attempt to addess non-iso endpoint\n");