[Qemu-devel] [6219] add missing MAC address to info_str for some NICs (Mark McLoughlin)

[Anthony Liguori]

Revision: 6219
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6219
Author:   aliguori
Date:     2009-01-07 17:47:15 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
add missing MAC address to info_str for some NICs (Mark McLoughlin)

Signed-off-by: Mark McLoughlin <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/mcf_fec.c
    trunk/hw/smc91c111.c
    trunk/hw/stellaris_enet.c
    trunk/hw/virtio-net.c

Modified: trunk/hw/mcf_fec.c
===================================================================
--- trunk/hw/mcf_fec.c  2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/mcf_fec.c  2009-01-07 17:47:15 UTC (rev 6219)
@@ -455,4 +455,5 @@
     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);
 }

Modified: trunk/hw/smc91c111.c
===================================================================
--- trunk/hw/smc91c111.c        2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/smc91c111.c        2009-01-07 17:47:15 UTC (rev 6219)
@@ -706,5 +706,6 @@
 
     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.  */
 }

Modified: trunk/hw/stellaris_enet.c
===================================================================
--- trunk/hw/stellaris_enet.c   2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/stellaris_enet.c   2009-01-07 17:47:15 UTC (rev 6219)
@@ -396,9 +396,11 @@
     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,

Modified: trunk/hw/virtio-net.c
===================================================================
--- trunk/hw/virtio-net.c       2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/virtio-net.c       2009-01-07 17:47:15 UTC (rev 6219)
@@ -318,6 +318,8 @@
     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;