提交 bc26e55a 编写于 作者: B Blue Swirl

Revert "Update irqs on reset and device load"

This reverts commit 3dcd219f.

It is incorrect to call qemu_irq functions (or any other functions that
access other device state) during savevm/loadvm.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 727170b6
......@@ -149,19 +149,13 @@ 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;
update_irqs(s);
qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0);
}
static void
......@@ -978,7 +972,6 @@ 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;
}
......@@ -1077,7 +1070,6 @@ 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)
......
......@@ -3317,8 +3317,6 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id)
s->cplus_enabled = s->CpCmd != 0;
}
rtl8139_update_irq(s);
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册