haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use NICInfo::model for eepro100 savevm ID string (Mark McLoughlin)

Browse source 
NICInfo::model will always be identical to the device name strings
we're currently passing to nic_init(). Just re-use NICInfo::model.

This makes it clear why we use vc->model for unregister_savevm()
in a subsequent patch.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7149 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-04-17 17:11:03 +00:00
parent 41bd13afda
commit 32a8f6ae93
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hw/eepro100.c
View file

@ -1710,15 +1710,14 @@ static void nic_save(QEMUFile * f, void *opaque)
qemu_put_buffer(f, s->configuration, sizeof(s->configuration)); qemu_put_buffer(f, s->configuration, sizeof(s->configuration));
} }
static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd, static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd, uint32_t device)
const char *name, uint32_t device)
{ {
PCIEEPRO100State *d; PCIEEPRO100State *d;
EEPRO100State *s; EEPRO100State *s;
logout("\n"); logout("\n");
d = (PCIEEPRO100State *) pci_register_device(bus, name, d = (PCIEEPRO100State *) pci_register_device(bus, nd->model,
sizeof(PCIEEPRO100State), -1, sizeof(PCIEEPRO100State), -1,
NULL, NULL); NULL, NULL);
@ -1757,24 +1756,23 @@ static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd,
qemu_register_reset(nic_reset, s); 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; return (PCIDevice *)d;
} }
PCIDevice *pci_i82551_init(PCIBus * bus, NICInfo * nd, int devfn) PCIDevice *pci_i82551_init(PCIBus * bus, NICInfo * nd, int devfn)
{ {
return nic_init(bus, nd, "i82551", i82551); return nic_init(bus, nd, i82551);
//~ uint8_t *pci_conf = d->dev.config;
} }
PCIDevice *pci_i82557b_init(PCIBus * bus, NICInfo * nd, int devfn) 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) PCIDevice *pci_i82559er_init(PCIBus * bus, NICInfo * nd, int devfn)
{ {
return nic_init(bus, nd, "i82559er", i82559ER); return nic_init(bus, nd, i82559ER);
} }
/* eof */ /* eof */