[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [7147] Remove NICInfo from e1000 and mipsnet state (Mark Mc
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [7147] Remove NICInfo from e1000 and mipsnet state (Mark McLoughlin) |
Date: |
Fri, 17 Apr 2009 17:10:56 +0000 |
Revision: 7147
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7147
Author: aliguori
Date: 2009-04-17 17:10:56 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/hw/e1000.c
trunk/hw/mipsnet.c
Modified: trunk/hw/e1000.c
===================================================================
--- trunk/hw/e1000.c 2009-04-17 17:10:51 UTC (rev 7146)
+++ trunk/hw/e1000.c 2009-04-17 17:10:56 UTC (rev 7147)
@@ -75,7 +75,6 @@
typedef struct E1000State_st {
PCIDevice dev;
VLANClientState *vc;
- NICInfo *nd;
int mmio_index;
uint32_t mac_reg[0x8000];
@@ -1078,7 +1077,6 @@
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 @@
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;
Modified: trunk/hw/mipsnet.c
===================================================================
--- trunk/hw/mipsnet.c 2009-04-17 17:10:51 UTC (rev 7146)
+++ trunk/hw/mipsnet.c 2009-04-17 17:10:56 UTC (rev 7147)
@@ -35,7 +35,6 @@
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 @@
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 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [7147] Remove NICInfo from e1000 and mipsnet state (Mark McLoughlin),
Anthony Liguori <=