From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lu7za-0008Kl-3w for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lu7zS-0008Gk-V0 for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:39 -0400 Received: from [199.232.76.173] (port=54433 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lu7zR-0008Fe-If for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:33 -0400 Received: from mail14.svc.cra.dublin.eircom.net ([159.134.118.30]:37193) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1Lu7zQ-00062L-KA for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:29:33 -0400 From: Mark McLoughlin Date: Wed, 15 Apr 2009 17:29:26 +0100 Message-Id: <1239812969-8320-7-git-send-email-markmc@redhat.com> In-Reply-To: <1239812969-8320-6-git-send-email-markmc@redhat.com> References: <1239812969-8320-1-git-send-email-markmc@redhat.com> <1239812969-8320-2-git-send-email-markmc@redhat.com> <1239812969-8320-3-git-send-email-markmc@redhat.com> <1239812969-8320-4-git-send-email-markmc@redhat.com> <1239812969-8320-5-git-send-email-markmc@redhat.com> <1239812969-8320-6-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 6/9] Remove NICInfo from e1000 and mipsnet state Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , qemu-devel@nongnu.org, Mark McLoughlin NICInfo isn't used after initialization, so remove it from the driver state structures. Signed-off-by: Mark McLoughlin --- hw/e1000.c | 4 +--- hw/mipsnet.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 1644201..2d16774 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 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); -- 1.6.0.6