From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajMPO-0007zo-Sq for qemu-devel@nongnu.org; Fri, 25 Mar 2016 03:44:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajMO6-0005Gc-Sb for qemu-devel@nongnu.org; Fri, 25 Mar 2016 03:43:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajMO6-0005GQ-KO for qemu-devel@nongnu.org; Fri, 25 Mar 2016 03:42:30 -0400 From: Jason Wang Date: Fri, 25 Mar 2016 15:42:09 +0800 Message-Id: <1458891729-28131-8-git-send-email-jasowang@redhat.com> In-Reply-To: <1458891729-28131-1-git-send-email-jasowang@redhat.com> References: <1458891729-28131-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 7/7] Revert "e1000: fix hang of win2k12 shutdown with flood ping" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Jason Wang , Sameeh Jubran From: Sameeh Jubran This reverts commit 9596ef7c7b8528bedb240792ea1fb598543ad3c4. This workaround in order to fix endless interrupts is no longer needed because it was superseded by the previous patch (e1000: Fixing interrupt pace). Signed-off-by: Sameeh Jubran Signed-off-by: Jason Wang --- hw/net/e1000.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 09b9ab5..8e79b55 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -456,11 +456,6 @@ static void e1000_reset(void *opaque) e1000_link_down(d); } - /* Throttle interrupts to prevent guest (e.g Win 2012) from - * reinjecting interrupts endlessly. TODO: fix non ITR case. - */ - d->mac_reg[ITR] = 250; - /* Some guests expect pre-initialized RAH/RAL (AddrValid flag + MACaddr) */ d->mac_reg[RA] = 0; d->mac_reg[RA + 1] = E1000_RAH_AV; -- 2.5.0