From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lurac-0005Xb-D2 for qemu-devel@nongnu.org; Fri, 17 Apr 2009 13:10:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lurab-0005WR-Ts for qemu-devel@nongnu.org; Fri, 17 Apr 2009 13:10:57 -0400 Received: from [199.232.76.173] (port=55440 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lurab-0005W5-B4 for qemu-devel@nongnu.org; Fri, 17 Apr 2009 13:10:57 -0400 Received: from savannah.gnu.org ([199.232.41.3]:36465 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Luraa-0001yS-Tq for qemu-devel@nongnu.org; Fri, 17 Apr 2009 13:10:57 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Luraa-0004ke-Fy for qemu-devel@nongnu.org; Fri, 17 Apr 2009 17:10:56 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1Luraa-0004ka-9U for qemu-devel@nongnu.org; Fri, 17 Apr 2009 17:10:56 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Fri, 17 Apr 2009 17:10:56 +0000 Subject: [Qemu-devel] [7147] Remove NICInfo from e1000 and mipsnet state (Mark McLoughlin) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Signed-off-by: Anthony Liguori 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);