From patchwork Fri Mar 25 07:42:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 8668841 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 89B169F44D for ; Fri, 25 Mar 2016 07:44:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA90520379 for ; Fri, 25 Mar 2016 07:44:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDD8020373 for ; Fri, 25 Mar 2016 07:44:47 +0000 (UTC) Received: from localhost ([::1]:54487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajMQJ-00006p-BA for patchwork-qemu-devel@patchwork.kernel.org; Fri, 25 Mar 2016 03:44:47 -0400 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 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 3C7503B724; Fri, 25 Mar 2016 07:42:30 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (vpn1-7-152.pek2.redhat.com [10.72.7.152]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2P7gCkO012304; Fri, 25 Mar 2016 03:42:28 -0400 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Jason Wang , Sameeh Jubran Subject: [Qemu-devel] [PULL 7/7] Revert "e1000: fix hang of win2k12 shutdown with flood ping" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;