Various NICs: Fix suspend/resume of multiple instances, by Jan Kiszka.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4892 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
2cfc5f17d3
commit
18fdb1c5c6
10
hw/e1000.c
10
hw/e1000.c
|
@ -76,7 +76,6 @@ typedef struct E1000State_st {
|
||||||
PCIDevice dev;
|
PCIDevice dev;
|
||||||
VLANClientState *vc;
|
VLANClientState *vc;
|
||||||
NICInfo *nd;
|
NICInfo *nd;
|
||||||
uint32_t instance;
|
|
||||||
uint32_t mmio_base;
|
uint32_t mmio_base;
|
||||||
int mmio_index;
|
int mmio_index;
|
||||||
|
|
||||||
|
@ -814,7 +813,6 @@ nic_save(QEMUFile *f, void *opaque)
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
pci_device_save(&s->dev, f);
|
pci_device_save(&s->dev, f);
|
||||||
qemu_put_be32s(f, &s->instance);
|
|
||||||
qemu_put_be32s(f, &s->mmio_base);
|
qemu_put_be32s(f, &s->mmio_base);
|
||||||
qemu_put_be32s(f, &s->rxbuf_size);
|
qemu_put_be32s(f, &s->rxbuf_size);
|
||||||
qemu_put_be32s(f, &s->rxbuf_min_shift);
|
qemu_put_be32s(f, &s->rxbuf_min_shift);
|
||||||
|
@ -859,7 +857,8 @@ nic_load(QEMUFile *f, void *opaque, int version_id)
|
||||||
|
|
||||||
if ((ret = pci_device_load(&s->dev, f)) < 0)
|
if ((ret = pci_device_load(&s->dev, f)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
qemu_get_be32s(f, &s->instance);
|
if (version_id == 1)
|
||||||
|
qemu_get_be32s(f, &i); /* once some unused instance id */
|
||||||
qemu_get_be32s(f, &s->mmio_base);
|
qemu_get_be32s(f, &s->mmio_base);
|
||||||
qemu_get_be32s(f, &s->rxbuf_size);
|
qemu_get_be32s(f, &s->rxbuf_size);
|
||||||
qemu_get_be32s(f, &s->rxbuf_min_shift);
|
qemu_get_be32s(f, &s->rxbuf_min_shift);
|
||||||
|
@ -958,7 +957,6 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
|
||||||
{
|
{
|
||||||
E1000State *d;
|
E1000State *d;
|
||||||
uint8_t *pci_conf;
|
uint8_t *pci_conf;
|
||||||
static int instance;
|
|
||||||
uint16_t checksum = 0;
|
uint16_t checksum = 0;
|
||||||
char *info_str = "e1000";
|
char *info_str = "e1000";
|
||||||
int i;
|
int i;
|
||||||
|
@ -989,8 +987,6 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
|
||||||
pci_register_io_region((PCIDevice *)d, 1, IOPORT_SIZE,
|
pci_register_io_region((PCIDevice *)d, 1, IOPORT_SIZE,
|
||||||
PCI_ADDRESS_SPACE_IO, ioport_map);
|
PCI_ADDRESS_SPACE_IO, ioport_map);
|
||||||
|
|
||||||
d->instance = instance++;
|
|
||||||
|
|
||||||
d->nd = nd;
|
d->nd = nd;
|
||||||
memmove(d->eeprom_data, e1000_eeprom_template,
|
memmove(d->eeprom_data, e1000_eeprom_template,
|
||||||
sizeof e1000_eeprom_template);
|
sizeof e1000_eeprom_template);
|
||||||
|
@ -1016,5 +1012,5 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
|
||||||
d->nd->macaddr[0], d->nd->macaddr[1], d->nd->macaddr[2],
|
d->nd->macaddr[0], d->nd->macaddr[1], d->nd->macaddr[2],
|
||||||
d->nd->macaddr[3], d->nd->macaddr[4], d->nd->macaddr[5]);
|
d->nd->macaddr[3], d->nd->macaddr[4], d->nd->macaddr[5]);
|
||||||
|
|
||||||
register_savevm(info_str, d->instance, 1, nic_save, nic_load, d);
|
register_savevm(info_str, -1, 2, nic_save, nic_load, d);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1792,8 +1792,7 @@ static void nic_init(PCIBus * bus, NICInfo * nd,
|
||||||
|
|
||||||
qemu_register_reset(nic_reset, s);
|
qemu_register_reset(nic_reset, s);
|
||||||
|
|
||||||
/* XXX: instance number ? */
|
register_savevm(name, -1, 3, nic_save, nic_load, s);
|
||||||
register_savevm(name, 0, 3, nic_save, nic_load, s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void pci_i82551_init(PCIBus * bus, NICInfo * nd, int devfn)
|
void pci_i82551_init(PCIBus * bus, NICInfo * nd, int devfn)
|
||||||
|
|
|
@ -753,7 +753,7 @@ void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd)
|
||||||
s->macaddr[4],
|
s->macaddr[4],
|
||||||
s->macaddr[5]);
|
s->macaddr[5]);
|
||||||
|
|
||||||
register_savevm("ne2000", 0, 2, ne2000_save, ne2000_load, s);
|
register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************/
|
/***********************************************************/
|
||||||
|
@ -823,6 +823,5 @@ void pci_ne2000_init(PCIBus *bus, NICInfo *nd, int devfn)
|
||||||
s->macaddr[4],
|
s->macaddr[4],
|
||||||
s->macaddr[5]);
|
s->macaddr[5]);
|
||||||
|
|
||||||
/* XXX: instance number ? */
|
register_savevm("ne2000", -1, 3, ne2000_save, ne2000_load, s);
|
||||||
register_savevm("ne2000", 0, 3, ne2000_save, ne2000_load, s);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1916,7 +1916,7 @@ static void pcnet_common_init(PCNetState *d, NICInfo *nd, const char *info_str)
|
||||||
d->vc = NULL;
|
d->vc = NULL;
|
||||||
}
|
}
|
||||||
pcnet_h_reset(d);
|
pcnet_h_reset(d);
|
||||||
register_savevm("pcnet", 0, 2, pcnet_save, pcnet_load, d);
|
register_savevm("pcnet", -1, 2, pcnet_save, pcnet_load, d);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* PCI interface */
|
/* PCI interface */
|
||||||
|
|
|
@ -3454,8 +3454,7 @@ void pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn)
|
||||||
s->cplus_txbuffer_len = 0;
|
s->cplus_txbuffer_len = 0;
|
||||||
s->cplus_txbuffer_offset = 0;
|
s->cplus_txbuffer_offset = 0;
|
||||||
|
|
||||||
/* XXX: instance number ? */
|
register_savevm("rtl8139", -1, 3, rtl8139_save, rtl8139_load, s);
|
||||||
register_savevm("rtl8139", 0, 3, rtl8139_save, rtl8139_load, s);
|
|
||||||
|
|
||||||
#if RTL8139_ONBOARD_TIMER
|
#if RTL8139_ONBOARD_TIMER
|
||||||
s->timer = qemu_new_timer(vm_clock, rtl8139_timer, s);
|
s->timer = qemu_new_timer(vm_clock, rtl8139_timer, s);
|
||||||
|
|
4
vl.c
4
vl.c
|
@ -6081,7 +6081,9 @@ typedef struct SaveStateEntry {
|
||||||
static SaveStateEntry *first_se;
|
static SaveStateEntry *first_se;
|
||||||
|
|
||||||
/* TODO: Individual devices generally have very little idea about the rest
|
/* TODO: Individual devices generally have very little idea about the rest
|
||||||
of the system, so instance_id should be removed/replaced. */
|
of the system, so instance_id should be removed/replaced.
|
||||||
|
Meanwhile pass -1 as instance_id if you do not already have a clearly
|
||||||
|
distinguishing id for all instances of your device class. */
|
||||||
int register_savevm(const char *idstr,
|
int register_savevm(const char *idstr,
|
||||||
int instance_id,
|
int instance_id,
|
||||||
int version_id,
|
int version_id,
|
||||||
|
|
Loading…
Reference in a new issue