From patchwork Fri Jun 29 16:27:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 168173 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 358DAB6FBB for ; Sat, 30 Jun 2012 02:27:32 +1000 (EST) Received: from localhost ([::1]:43874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ske2b-0007nc-Sl for incoming@patchwork.ozlabs.org; Fri, 29 Jun 2012 12:27:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ske2P-0007kv-Mm for qemu-devel@nongnu.org; Fri, 29 Jun 2012 12:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ske2J-0007x4-90 for qemu-devel@nongnu.org; Fri, 29 Jun 2012 12:27:17 -0400 Received: from david.siemens.de ([192.35.17.14]:27312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ske2I-0007wF-WD for qemu-devel@nongnu.org; Fri, 29 Jun 2012 12:27:11 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id q5TGR7Mq028941; Fri, 29 Jun 2012 18:27:07 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q5TGR6Ik021847; Fri, 29 Jun 2012 18:27:06 +0200 Message-ID: <4FEDD75A.1010705@siemens.com> Date: Fri, 29 Jun 2012 18:27:06 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Gerd Hoffmann X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Erik Rull , qemu-devel Subject: [Qemu-devel] [PATCH] usb: Remove obsolete assert from usb_packet_complete 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 Due to queuing/pipelining, there can now be multiple packets per endpoint in flight. So the assertion in usb_packet_complete became wrong and can cause bogus QEMU terminations. Seen with a passed-through USB headset. Signed-off-by: Jan Kiszka --- I'm not 100% sure that the assertion that the assertion is no longer needed is actually correct. However, things work fine here without it. hw/usb/core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 0e02da7..f4e4bbf 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -407,7 +407,6 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p) int ret; usb_packet_check_state(p, USB_PACKET_ASYNC); - assert(QTAILQ_FIRST(&ep->queue) == p); usb_packet_set_state(p, USB_PACKET_COMPLETE); QTAILQ_REMOVE(&ep->queue, p, queue); dev->port->ops->complete(dev->port, p);