From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScZ49-0000RE-KR for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:31:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScZ41-0004Gn-8k for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:31:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScZ40-0004FO-U5 for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:31:33 -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 q579VV0R021054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Jun 2012 05:31:31 -0400 From: Gerd Hoffmann Date: Thu, 7 Jun 2012 11:31:14 +0200 Message-Id: <1339061486-28513-26-git-send-email-kraxel@redhat.com> In-Reply-To: <1339061486-28513-1-git-send-email-kraxel@redhat.com> References: <1339061486-28513-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 25/37] ehci: tweak queue initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Little tweak for the queue initialization, set the QH address in the allocation function. Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ehci.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index ccaa947..aa67af6 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -692,13 +692,14 @@ static void ehci_free_packet(EHCIPacket *p) /* queue management */ -static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, int async) +static EHCIQueue *ehci_alloc_queue(EHCIState *ehci, uint32_t addr, int async) { EHCIQueueHead *head = async ? &ehci->aqueues : &ehci->pqueues; EHCIQueue *q; q = g_malloc0(sizeof(*q)); q->ehci = ehci; + q->qhaddr = addr; QTAILQ_INIT(&q->packets); QTAILQ_INSERT_HEAD(head, q, next); trace_usb_ehci_queue_action(q, "alloc"); @@ -1672,12 +1673,11 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) entry = ehci_get_fetch_addr(ehci, async); q = ehci_find_queue_by_qh(ehci, entry, async); if (NULL == q) { - q = ehci_alloc_queue(ehci, async); + q = ehci_alloc_queue(ehci, entry, async); } p = QTAILQ_FIRST(&q->packets); - q->qhaddr = entry; - q->seen++; + q->seen++; if (q->seen > 1) { /* we are going in circles -- stop processing */ ehci_set_state(ehci, async, EST_ACTIVE); -- 1.7.1