From patchwork Fri Jul 6 10:09:33 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: 1164641 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CDF76DF236 for ; Fri, 6 Jul 2012 10:09:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756761Ab2GFKJE (ORCPT ); Fri, 6 Jul 2012 06:09:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10950 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756735Ab2GFKJC (ORCPT ); Fri, 6 Jul 2012 06:09:02 -0400 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 q66A908n030205 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 6 Jul 2012 06:09:01 -0400 Received: from shalem.localdomain.com (vpn1-4-112.ams2.redhat.com [10.36.4.112]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q66A8uCm001768; Fri, 6 Jul 2012 06:08:59 -0400 From: Hans de Goede To: Gerd Hoffmann Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Hans de Goede Subject: [PATCH 2/2] usb-ehci: Fix an assert whenever isoc transfers are used Date: Fri, 6 Jul 2012 12:09:33 +0200 Message-Id: <1341569373-9478-3-git-send-email-hdegoede@redhat.com> In-Reply-To: <1341569373-9478-1-git-send-email-hdegoede@redhat.com> References: <1341569373-9478-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org hcd-ehci.c is missing an usb_packet_init() call for the ipacket UsbPacket it uses for isoc transfers, triggering an assert (taking the entire vm down) in usb_packet_setup as soon as any isoc transfers are done by a high speed USB device. Signed-off-by: Hans de Goede --- hw/usb/hcd-ehci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index e759c99..eaa3ddd 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2300,6 +2300,7 @@ static int usb_ehci_initfn(PCIDevice *dev) s->frame_timer = qemu_new_timer_ns(vm_clock, ehci_frame_timer, s); QTAILQ_INIT(&s->aqueues); QTAILQ_INIT(&s->pqueues); + usb_packet_init(&s->ipacket); qemu_register_reset(ehci_reset, s);