From ad067148585b1fc98814b1ca3db4d0c1fdd969e0 Mon Sep 17 00:00:00 2001 From: aliguori Date: Fri, 17 Apr 2009 17:10:56 +0000 Subject: 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7147 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/mipsnet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'hw/mipsnet.c') diff --git a/hw/mipsnet.c b/hw/mipsnet.c index 29bd9b8..415b04e 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); -- cgit v1.1