diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:10:56 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:10:56 +0000 |
| commit | ad067148585b1fc98814b1ca3db4d0c1fdd969e0 (patch) | |
| tree | 62e521bef7c201c5aa352b2422bf99ba588c8f7e /hw | |
| parent | 9036de1a8ad6c565a4e5d8cd124ad8dd05e7d4d4 (diff) | |
Remove NICInfo from e1000 and mipsnet state (Mark McLoughlin)
NICInfo isn't used after initialization, so remove it from the driver
state structures.
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@7147 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/e1000.c | 4 | ||||
| -rw-r--r-- | hw/mipsnet.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index 1644201d6e..2d16774dad 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -75,7 +75,6 @@ enum { typedef struct E1000State_st { PCIDevice dev; VLANClientState *vc; - NICInfo *nd; int mmio_index; uint32_t mac_reg[0x8000]; @@ -1078,7 +1077,6 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) pci_register_io_region((PCIDevice *)d, 1, IOPORT_SIZE, PCI_ADDRESS_SPACE_IO, ioport_map); - d->nd = nd; memmove(d->eeprom_data, e1000_eeprom_template, sizeof e1000_eeprom_template); for (i = 0; i < 3; i++) @@ -1099,7 +1097,7 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) e1000_receive, e1000_can_receive, d); d->vc->link_status_changed = e1000_set_link_status; - qemu_format_nic_info_str(d->vc, d->nd->macaddr); + qemu_format_nic_info_str(d->vc, nd->macaddr); register_savevm(info_str, -1, 2, nic_save, nic_load, d); d->dev.unregister = pci_e1000_uninit; diff --git a/hw/mipsnet.c b/hw/mipsnet.c index 29bd9b863d..415b04e2ce 100644 --- a/hw/mipsnet.c +++ b/hw/mipsnet.c @@ -35,7 +35,6 @@ typedef struct MIPSnetState { uint8_t tx_buffer[MAX_ETH_FRAME_SIZE]; qemu_irq irq; VLANClientState *vc; - NICInfo *nd; } MIPSnetState; static void mipsnet_reset(MIPSnetState *s) @@ -248,7 +247,6 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd) register_ioport_read(base, 36, 4, mipsnet_ioport_read, s); s->irq = irq; - s->nd = nd; if (nd && nd->vlan) { s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, mipsnet_receive, mipsnet_can_receive, s); @@ -256,7 +254,7 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd) s->vc = NULL; } - qemu_format_nic_info_str(s->vc, s->nd->macaddr); + qemu_format_nic_info_str(s->vc, nd->macaddr); mipsnet_reset(s); register_savevm("mipsnet", 0, 0, mipsnet_save, mipsnet_load, s); |