From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LKDQC-0006aM-UW for qemu-devel@nongnu.org; Tue, 06 Jan 2009 10:00:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LKDQ8-0006Y5-TI for qemu-devel@nongnu.org; Tue, 06 Jan 2009 10:00:42 -0500 Received: from [199.232.76.173] (port=43492 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LKDQ8-0006Xt-NW for qemu-devel@nongnu.org; Tue, 06 Jan 2009 10:00:40 -0500 Received: from mail28.svc.cra.dublin.eircom.net ([159.134.118.224]:43752) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1LKDQ7-0003qS-Jb for qemu-devel@nongnu.org; Tue, 06 Jan 2009 10:00:39 -0500 From: Mark McLoughlin Date: Tue, 6 Jan 2009 15:00:35 +0000 Message-Id: <1231254036-29060-5-git-send-email-markmc@redhat.com> In-Reply-To: <1231254036-29060-4-git-send-email-markmc@redhat.com> References: <1231253967.23355.1.camel@localhost.localdomain> <1231254036-29060-1-git-send-email-markmc@redhat.com> <1231254036-29060-2-git-send-email-markmc@redhat.com> <1231254036-29060-3-git-send-email-markmc@redhat.com> <1231254036-29060-4-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] add missing MAC address to info_str for some NICs 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: Mark McLoughlin , qemu-devel@nongnu.org Signed-off-by: Mark McLoughlin --- hw/mcf_fec.c | 1 + hw/smc91c111.c | 1 + hw/stellaris_enet.c | 4 +++- hw/virtio-net.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c index 7e3afa5..6c044cd 100644 --- a/hw/mcf_fec.c +++ b/hw/mcf_fec.c @@ -455,4 +455,5 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq) s->vc = qemu_new_vlan_client(nd->vlan, nd->model, mcf_fec_receive, mcf_fec_can_receive, s); memcpy(s->macaddr, nd->macaddr, 6); + qemu_format_nic_info_str(n->vc, s->macaddr); } diff --git a/hw/smc91c111.c b/hw/smc91c111.c index fadd151..6416026 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -706,5 +706,6 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq) s->vc = qemu_new_vlan_client(nd->vlan, nd->model, smc91c111_receive, smc91c111_can_receive, s); + qemu_format_nic_info_str(s->vc, s->macaddr); /* ??? Save/restore. */ } diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index bd8dcd9..69fb85d 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -396,9 +396,11 @@ void stellaris_enet_init(NICInfo *nd, uint32_t base, qemu_irq irq) s->irq = irq; memcpy(s->macaddr, nd->macaddr, 6); - if (nd->vlan) + if (nd->vlan) { s->vc = qemu_new_vlan_client(nd->vlan, nd->model, stellaris_enet_receive, stellaris_enet_can_receive, s); + qemu_format_nic_info_str(s->vc, s->macaddr); + } stellaris_enet_reset(s); register_savevm("stellaris_enet", -1, 1, diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 4500fab..b197c70 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -318,6 +318,8 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n->vc = qemu_new_vlan_client(nd->vlan, nd->model, virtio_net_receive, virtio_net_can_receive, n); + qemu_format_nic_info_str(n->vc, n->mac); + n->tx_timer = qemu_new_timer(vm_clock, virtio_net_tx_timer, n); n->tx_timer_active = 0; n->mergeable_rx_bufs = 0; -- 1.6.0.6