Revert "e1000: fix hang of win2k12 shutdown with flood ping"
authorSameeh Jubran <sameeh@daynix.com>
Thu, 17 Mar 2016 07:37:58 +0000 (09:37 +0200)
committerJason Wang <jasowang@redhat.com>
Wed, 30 Mar 2016 00:57:42 +0000 (08:57 +0800)
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 <sameeh@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
hw/net/e1000.c

index 09b9ab5377116a5df7763ca9e83fddccf39371c8..8e79b550e6bdb17fa9c5f6aceb118c6f3834dec9 100644 (file)
@@ -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;