ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update irqs on reset and device load 

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-06-09 17:11:48 +00:00
parent 32c86e95b2
commit 3dcd219f09
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/e1000.c
View File

@ -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); 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 static void
set_interrupt_cause(E1000State *s, int index, uint32_t val) set_interrupt_cause(E1000State *s, int index, uint32_t val)
{ {
if (val) if (val)
val |= E1000_ICR_INT_ASSERTED; val |= E1000_ICR_INT_ASSERTED;
s->mac_reg[ICR] = val; 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 static void
@ -970,6 +976,7 @@ nic_load(QEMUFile *f, void *opaque, int version_id)
for (j = 0; j < mac_regarraystosave[i].size; j++) for (j = 0; j < mac_regarraystosave[i].size; j++)
qemu_get_be32s(f, qemu_get_be32s(f,
s->mac_reg + mac_regarraystosave[i].array0 + j); s->mac_reg + mac_regarraystosave[i].array0 + j);
update_irqs(s);
return 0; return 0;
} }
@ -1068,6 +1075,7 @@ static void e1000_reset(void *opaque)
memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init); memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init);
d->rxbuf_min_shift = 1; d->rxbuf_min_shift = 1;
memset(&d->tx, 0, sizeof d->tx); memset(&d->tx, 0, sizeof d->tx);
update_irqs(d);
} }
static void pci_e1000_init(PCIDevice *pci_dev) static void pci_e1000_init(PCIDevice *pci_dev)

2
hw/rtl8139.c
View File

@ -3314,6 +3314,8 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id)
s->cplus_enabled = s->CpCmd != 0; s->cplus_enabled = s->CpCmd != 0;
} }
rtl8139_update_irq(s);
return 0; return 0;
} }