From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG3q7-0005PH-W0 for qemu-devel@nongnu.org; Fri, 17 Jul 2015 07:30:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZG3q7-0005YQ-34 for qemu-devel@nongnu.org; Fri, 17 Jul 2015 07:30:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36515) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG3q6-0005Xn-Uj for qemu-devel@nongnu.org; Fri, 17 Jul 2015 07:30:03 -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 (Postfix) with ESMTPS id 9CD62344F51 for ; Fri, 17 Jul 2015 11:30:02 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 17 Jul 2015 13:29:53 +0200 Message-Id: <1437132593-6611-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1437132593-6611-1-git-send-email-kraxel@redhat.com> References: <1437132593-6611-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 4/4] Revert "xhci: set timer to retry xfers" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann This reverts commit 4e8cfbe1143d8384387595b500212d7a7f11aeae. We should not poll via timer, and with ccid being fixed to properly notify us about pending transfers we don't have to. Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-xhci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 90a5fbf..c673bed 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2222,8 +2222,6 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, if (xfer->running_retry) { DPRINTF("xhci: xfer nacked, stopping schedule\n"); epctx->retry = xfer; - timer_mod(epctx->kick_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - epctx->interval * 125000); break; } } -- 1.8.3.1