diff --git a/hw/eepro100.c b/hw/eepro100.c index 0a343df65a..c72b990f22 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1710,15 +1710,14 @@ static void nic_save(QEMUFile * f, void *opaque) qemu_put_buffer(f, s->configuration, sizeof(s->configuration)); } -static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd, - const char *name, uint32_t device) +static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd, uint32_t device) { PCIEEPRO100State *d; EEPRO100State *s; logout("\n"); - d = (PCIEEPRO100State *) pci_register_device(bus, name, + d = (PCIEEPRO100State *) pci_register_device(bus, nd->model, sizeof(PCIEEPRO100State), -1, NULL, NULL); @@ -1757,24 +1756,23 @@ static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd, qemu_register_reset(nic_reset, s); - register_savevm(name, -1, 3, nic_save, nic_load, s); + register_savevm(s->vc->model, -1, 3, nic_save, nic_load, s); return (PCIDevice *)d; } PCIDevice *pci_i82551_init(PCIBus * bus, NICInfo * nd, int devfn) { - return nic_init(bus, nd, "i82551", i82551); - //~ uint8_t *pci_conf = d->dev.config; + return nic_init(bus, nd, i82551); } PCIDevice *pci_i82557b_init(PCIBus * bus, NICInfo * nd, int devfn) { - return nic_init(bus, nd, "i82557b", i82557B); + return nic_init(bus, nd, i82557B); } PCIDevice *pci_i82559er_init(PCIBus * bus, NICInfo * nd, int devfn) { - return nic_init(bus, nd, "i82559er", i82559ER); + return nic_init(bus, nd, i82559ER); } /* eof */