falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
aliguori 2009-01-07 17:47:15 +00:00
parent 7cb7434b1e
commit 96d5e20138
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/mcf_fec.c
View File

@ -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);
}

1
hw/smc91c111.c
View File

@ -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. */
}

4
hw/stellaris_enet.c
View File

@ -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,

2
hw/virtio-net.c
View File

@ -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;