mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NICInfo from e1000 and mipsnet state (Mark McLoughlin)

Browse Source 
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
This commit is contained in:
aliguori 2009-04-17 17:10:56 +00:00
parent 9036de1a8a
commit ad06714858
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/e1000.c
View File

@ -75,7 +75,6 @@ enum {
typedef struct E1000State_st { typedef struct E1000State_st {
PCIDevice dev; PCIDevice dev;
VLANClientState *vc; VLANClientState *vc;
NICInfo *nd;
int mmio_index; int mmio_index;
uint32_t mac_reg[0x8000]; 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_register_io_region((PCIDevice *)d, 1, IOPORT_SIZE,
PCI_ADDRESS_SPACE_IO, ioport_map); PCI_ADDRESS_SPACE_IO, ioport_map);
d->nd = nd;
memmove(d->eeprom_data, e1000_eeprom_template, memmove(d->eeprom_data, e1000_eeprom_template,
sizeof e1000_eeprom_template); sizeof e1000_eeprom_template);
for (i = 0; i < 3; i++) 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); e1000_receive, e1000_can_receive, d);
d->vc->link_status_changed = e1000_set_link_status; 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); register_savevm(info_str, -1, 2, nic_save, nic_load, d);
d->dev.unregister = pci_e1000_uninit; d->dev.unregister = pci_e1000_uninit;

4
hw/mipsnet.c
View File

@ -35,7 +35,6 @@ typedef struct MIPSnetState {
uint8_t tx_buffer[MAX_ETH_FRAME_SIZE]; uint8_t tx_buffer[MAX_ETH_FRAME_SIZE];
qemu_irq irq; qemu_irq irq;
VLANClientState *vc; VLANClientState *vc;
NICInfo *nd;
} MIPSnetState; } MIPSnetState;
static void mipsnet_reset(MIPSnetState *s) 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); register_ioport_read(base, 36, 4, mipsnet_ioport_read, s);
s->irq = irq; s->irq = irq;
s->nd = nd;
if (nd && nd->vlan) { if (nd && nd->vlan) {
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
mipsnet_receive, mipsnet_can_receive, s); mipsnet_receive, mipsnet_can_receive, s);
@ -256,7 +254,7 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
s->vc = NULL; 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); mipsnet_reset(s);
register_savevm("mipsnet", 0, 0, mipsnet_save, mipsnet_load, s); register_savevm("mipsnet", 0, 0, mipsnet_save, mipsnet_load, s);