From 3dcd219f09d6c1817bf9a132899e6b925f7a0914 Mon Sep 17 00:00:00 2001
From: Blue Swirl <blauwirbel@gmail.com>
Date: Tue, 9 Jun 2009 17:11:48 +0000
Subject: [PATCH] Update irqs on reset and device load

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 hw/e1000.c   | 10 +++++++++-
 hw/rtl8139.c |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hw/e1000.c b/hw/e1000.c
index a04d7b1fe4..03fad4cc94 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -149,13 +149,19 @@ ioport_map(PCIDevice *pci_dev, int region_num, uint32_t addr,
     DBGOUT(IO, "e1000_ioport_map addr=0x%04x size=0x%08x\n", addr, size);
 }
 
+static void
+update_irqs(E1000State *s)
+{
+    qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0);
+}
+
 static void
 set_interrupt_cause(E1000State *s, int index, uint32_t val)
 {
     if (val)
         val |= E1000_ICR_INT_ASSERTED;
     s->mac_reg[ICR] = val;
-    qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0);
+    update_irqs(s);
 }
 
 static void
@@ -970,6 +976,7 @@ nic_load(QEMUFile *f, void *opaque, int version_id)
         for (j = 0; j < mac_regarraystosave[i].size; j++)
             qemu_get_be32s(f,
                            s->mac_reg + mac_regarraystosave[i].array0 + j);
+    update_irqs(s);
     return 0;
 }
 
@@ -1068,6 +1075,7 @@ static void e1000_reset(void *opaque)
     memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init);
     d->rxbuf_min_shift = 1;
     memset(&d->tx, 0, sizeof d->tx);
+    update_irqs(d);
 }
 
 static void pci_e1000_init(PCIDevice *pci_dev)
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index ea2ca25182..ea27dcfea0 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -3314,6 +3314,8 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id)
         s->cplus_enabled = s->CpCmd != 0;
     }
 
+    rtl8139_update_irq(s);
+
     return 0;
 }