From: Jason Wang <jasowang@redhat.com>
Date: Thu, 22 Mar 2012 10:02:34 +0000 (+0800)
Subject: e1000: set E1000_ICR_INT_ASSERTED only for 8257x
X-Git-Tag: v1.1-rc0~35^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1219091edd20e3b92544025c2b6dd5e4d98b61b;p=thirdparty%2Fqemu.git

e1000: set E1000_ICR_INT_ASSERTED only for 8257x

E1000_ICR_INT_ASSERTED were introduced only for 8257x, so we need to
check the E1000_DEVID before setting this bit in ICS.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/e1000.c b/hw/e1000.c
index b5c26e0dd86..4573f1301e7 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -223,8 +223,10 @@ static const uint32_t mac_reg_init[] = {
 static void
 set_interrupt_cause(E1000State *s, int index, uint32_t val)
 {
-    if (val)
+    if (val && (E1000_DEVID >= E1000_DEV_ID_82547EI_MOBILE)) {
+        /* Only for 8257x */
         val |= E1000_ICR_INT_ASSERTED;
+    }
     s->mac_reg[ICR] = val;
     s->mac_reg[ICS] = val;
     qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0);