[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [7159] Use NICInfo::model for eepro100 savevm ID string (Ma
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [7159] Use NICInfo::model for eepro100 savevm ID string (Mark McLoughlin) |
Date: |
Fri, 17 Apr 2009 18:06:51 +0000 |
Revision: 7159
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7159
Author: aliguori
Date: 2009-04-17 18:06:50 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
Use NICInfo::model for eepro100 savevm ID string (Mark McLoughlin)
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
branches/stable_0_10/hw/eepro100.c
Modified: branches/stable_0_10/hw/eepro100.c
===================================================================
--- branches/stable_0_10/hw/eepro100.c 2009-04-17 18:06:46 UTC (rev 7158)
+++ branches/stable_0_10/hw/eepro100.c 2009-04-17 18:06:50 UTC (rev 7159)
@@ -1735,15 +1735,14 @@
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);
@@ -1782,24 +1781,23 @@
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 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [7159] Use NICInfo::model for eepro100 savevm ID string (Mark McLoughlin),
Anthony Liguori <=