From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAd8P-0005MH-2F for qemu-devel@nongnu.org; Thu, 22 Mar 2012 04:12:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAd8K-0007JP-75 for qemu-devel@nongnu.org; Thu, 22 Mar 2012 04:12:36 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:61478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAd8J-0007J3-UY for qemu-devel@nongnu.org; Thu, 22 Mar 2012 04:12:32 -0400 Date: Thu, 22 Mar 2012 09:12:27 +0100 (CET) From: Erik Rull Message-ID: <1092769690.678841.1332403947552.JavaMail.open-xchange@email.1und1.de> In-Reply-To: <1332351418-32233-1-git-send-email-kraxel@redhat.com> References: <1332351418-32233-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] uhci: stop queue filling when we find a in-flight td Reply-To: Erik Rull List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Gerd Hoffmann On March 21, 2012 at 6:36 PM Gerd Hoffmann wrote: > Not only QHs can form rings, but TDs too. With the new > queuing/pipelining support we are following TD chains and > can actually walk in circles. An assert() prevents us from > entering an endless loop then. > > Fix is easy: Just stop queuing when we figure the TD we are > about to queue up is in flight already. > > Signed-off-by: Gerd Hoffmann > --- > hw/usb/hcd-uhci.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c > index e55dad9..2be564b 100644 > --- a/hw/usb/hcd-uhci.c > +++ b/hw/usb/hcd-uhci.c > @@ -965,6 +965,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td) > } > trace_usb_uhci_td_queue(plink & ~0xf, ptd.ctrl, ptd.token); > ret = uhci_handle_td(s, plink, &ptd, &int_mask); > + if (ret == TD_RESULT_ASYNC_CONT) { > + break; > + } > assert(ret == TD_RESULT_ASYNC_START); > assert(int_mask == 0); > plink = ptd.link; > -- > 1.7.1 > > Issue fixed - my Windows boots again :-) Thanks a lot! Best regards, Erik