add missing MAC address to info_str for some NICs (Mark McLoughlin)

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6219 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c
index 7e3afa5..6c044cd 100644 (file)
--- 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);
     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 (file)
--- 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);
 
     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.  */
 }
     /* ??? Save/restore.  */
 }

diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c
index bd8dcd9..69fb85d 100644 (file)
--- 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);
 
     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);
         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,
 
     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 (file)
--- 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);
 
     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;
     n->tx_timer = qemu_new_timer(vm_clock, virtio_net_tx_timer, n);
     n->tx_timer_active = 0;
     n->mergeable_rx_bufs = 0;