From patchwork Thu Mar 17 07:37:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameeh Jubran X-Patchwork-Id: 8611911 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 87ABF9F6E1 for ; Thu, 17 Mar 2016 14:44:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E584F201F2 for ; Thu, 17 Mar 2016 14: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 386162026F for ; Thu, 17 Mar 2016 14:44:48 +0000 (UTC) Received: from localhost ([::1]:35411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agZAN-0005aQ-JD for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Mar 2016 10:44:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agSVV-0006Bk-Rw for qemu-devel@nongnu.org; Thu, 17 Mar 2016 03:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agSVU-0001Ye-MX for qemu-devel@nongnu.org; Thu, 17 Mar 2016 03:38:09 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agSVU-0001Ya-Fu for qemu-devel@nongnu.org; Thu, 17 Mar 2016 03:38:08 -0400 Received: by mail-wm0-x241.google.com with SMTP id x188so5154918wmg.0 for ; Thu, 17 Mar 2016 00:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3C28zlgeJWMYiGZWemiC/50Vs97mLwS3KXKFXLopfQ0=; b=QlynPngy3eDGwzrEtYHlWE1XsdJC5yJapTrG9YjoK3BOnISyJJwfFdXDrWD5/I1ZQX d1R4SSmApZwLdNQzC9eJIwxOLslm7UxV5I29V75ctpZczkHkuc/x94VjrvoFVDEbK8nk gbgb0XWRI6R2kEFjCRLAU4ewe8mGuWU2PLI7NXw9NO/O0C4y0IAQpXBHDIsfl86p/F/2 3y9RIKAJw3TzJjza5ivMyuwM0LReUHFw3AWD4AHAj73qb/l5YNzT3rW11g5uwX0eMT0P qEK2jr1y3b6PHnbXIJqrwmhZflnK8KVcB9Oj8TVXgKie23sqSnGlbaBPuD2Df3FMKm+k ILCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3C28zlgeJWMYiGZWemiC/50Vs97mLwS3KXKFXLopfQ0=; b=QqWTbWAHRP2ni2Euowh6VVId3ki35CdTJWJEXXPT1QUWNbu4zXQ9J3sBFAoDmImTjU /8lWusVSpVwjquRsQ+O63fK7lXkDgYl02mNdvg15Wh7qwofmsZ+WMbI1GbADuoB1SZzJ 5mCwc7LBe91DtXd0Kgdg6mxfk53AwACGZwy4iz0GU85D/b2SAmtjSG5V/SoiGFo2Bx2b dSJ5hRoXhJoo23aXajyOQaZbZMnlr/X7/jpJ++LgTfXG9Oi+Ob7rGspSrCYfti+xzjlY q9ZbyKxJrNEohJSsZAV8shzBy+AMoOX84U/jbR9kcZrpHeU/CbdkxjfdHMXJ1lHCq2hw jKbQ== X-Gm-Message-State: AD7BkJLJl4E027OqnZXnYPEZlj8oj8K8O6vZnLgtpaSYN1WOF52f2eAdCDf9W3zkuyyivw== X-Received: by 10.194.93.42 with SMTP id cr10mr8090951wjb.33.1458200287944; Thu, 17 Mar 2016 00:38:07 -0700 (PDT) Received: from bark.daynix ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id y62sm6782431wmg.12.2016.03.17.00.38.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Mar 2016 00:38:07 -0700 (PDT) From: Sameeh Jubran To: , Jason Wang Date: Thu, 17 Mar 2016 09:37:58 +0200 Message-Id: <1458200278-11940-3-git-send-email-sameeh@daynix.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458200278-11940-1-git-send-email-sameeh@daynix.com> References: <1458200278-11940-1-git-send-email-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 X-Mailman-Approved-At: Thu, 17 Mar 2016 10:44:16 -0400 Cc: Dmitry Fleytman , Yan Vugenfirer Subject: [Qemu-devel] [PATCH 2/2] 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 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 --- 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;