diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-07 17:47:15 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-07 17:47:15 +0000 |
| commit | 96d5e20138b177f2d79c178a6f994015347e6cca (patch) | |
| tree | d9035f5af49beaa97ee37cc03712926c62a39b02 | |
| parent | 7cb7434b1e4aee549b55536208abe56e35159763 (diff) | |
| download | focaccia-qemu-96d5e20138b177f2d79c178a6f994015347e6cca.tar.gz focaccia-qemu-96d5e20138b177f2d79c178a6f994015347e6cca.zip | |
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
| -rw-r--r-- | hw/mcf_fec.c | 1 | ||||
| -rw-r--r-- | hw/smc91c111.c | 1 | ||||
| -rw-r--r-- | hw/stellaris_enet.c | 4 | ||||
| -rw-r--r-- | 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 7e3afa5770..6c044cd819 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 fadd15156a..6416026e82 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 bd8dcd9657..69fb85db3e 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 4500fab6cf..b197c70a75 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; |