aboutsummaryrefslogtreecommitdiff
path: root/hw/e1000.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-06-09 17:11:48 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-06-09 17:11:48 +0000
commit3dcd219f09d6c1817bf9a132899e6b925f7a0914 (patch)
tree1fb465ed328124ce9e65db0654a09f9ef3e34c4f /hw/e1000.c
parent32c86e95b258515099d04f9eff48efc57a469bf7 (diff)
Update irqs on reset and device load
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/e1000.c')
-rw-r--r--hw/e1000.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/hw/e1000.c b/hw/e1000.c
index a04d7b1fe4..03fad4cc94 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -150,12 +150,18 @@ ioport_map(PCIDevice *pci_dev, int region_num, uint32_t addr,
}
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)