PCIDevice dev;
VLANClientState *vc;
NICInfo *nd;
- uint32_t instance;
uint32_t mmio_base;
int mmio_index;
int i, j;
pci_device_save(&s->dev, f);
- qemu_put_be32s(f, &s->instance);
qemu_put_be32s(f, &s->mmio_base);
qemu_put_be32s(f, &s->rxbuf_size);
qemu_put_be32s(f, &s->rxbuf_min_shift);
if ((ret = pci_device_load(&s->dev, f)) < 0)
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->rxbuf_size);
qemu_get_be32s(f, &s->rxbuf_min_shift);
{
E1000State *d;
uint8_t *pci_conf;
- static int instance;
uint16_t checksum = 0;
char *info_str = "e1000";
int i;
pci_register_io_region((PCIDevice *)d, 1, IOPORT_SIZE,
PCI_ADDRESS_SPACE_IO, ioport_map);
- d->instance = instance++;
-
d->nd = nd;
memmove(d->eeprom_data, e1000_eeprom_template,
sizeof e1000_eeprom_template);
d->nd->macaddr[0], d->nd->macaddr[1], d->nd->macaddr[2],
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);
}
qemu_register_reset(nic_reset, s);
- /* XXX: instance number ? */
- register_savevm(name, 0, 3, nic_save, nic_load, s);
+ register_savevm(name, -1, 3, nic_save, nic_load, s);
}
void pci_i82551_init(PCIBus * bus, NICInfo * nd, int devfn)
s->macaddr[4],
s->macaddr[5]);
- register_savevm("ne2000", 0, 2, ne2000_save, ne2000_load, s);
+ register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s);
}
/***********************************************************/
s->macaddr[4],
s->macaddr[5]);
- /* XXX: instance number ? */
- register_savevm("ne2000", 0, 3, ne2000_save, ne2000_load, s);
+ register_savevm("ne2000", -1, 3, ne2000_save, ne2000_load, s);
}
d->vc = NULL;
}
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 */
s->cplus_txbuffer_len = 0;
s->cplus_txbuffer_offset = 0;
- /* XXX: instance number ? */
- register_savevm("rtl8139", 0, 3, rtl8139_save, rtl8139_load, s);
+ register_savevm("rtl8139", -1, 3, rtl8139_save, rtl8139_load, s);
#if RTL8139_ONBOARD_TIMER
s->timer = qemu_new_timer(vm_clock, rtl8139_timer, s);
static SaveStateEntry *first_se;
/* 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 instance_id,
int version_id,