From bf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db Mon Sep 17 00:00:00 2001 From: aliguori Date: Wed, 7 Jan 2009 17:42:25 +0000 Subject: Add a model string to VLANClientState (Mark McLoughlin) Don't lose track of what type/model a vlan client is so that we can e.g. assign a global per-model id to clients. The entire patch is basically a tedious excercise in making sure the type/model string gets propagated down to qemu_new_vlan_client(). Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6216 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/e1000.c | 4 ++-- hw/eepro100.c | 3 ++- hw/etraxfs_eth.c | 2 +- hw/mcf_fec.c | 4 ++-- hw/mipsnet.c | 4 ++-- hw/musicpal.c | 3 ++- hw/ne2000.c | 8 ++++---- hw/pcnet.c | 4 ++-- hw/rtl8139.c | 4 ++-- hw/smc91c111.c | 4 ++-- hw/stellaris_enet.c | 4 ++-- hw/usb-net.c | 2 +- hw/virtio-net.c | 4 ++-- 13 files changed, 26 insertions(+), 24 deletions(-) (limited to 'hw') diff --git a/hw/e1000.c b/hw/e1000.c index 7ca0747..03c573b 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1071,8 +1071,8 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) d->rxbuf_min_shift = 1; memset(&d->tx, 0, sizeof d->tx); - d->vc = qemu_new_vlan_client(nd->vlan, e1000_receive, - e1000_can_receive, d); + d->vc = qemu_new_vlan_client(nd->vlan, nd->model, + e1000_receive, e1000_can_receive, d); snprintf(d->vc->info_str, sizeof(d->vc->info_str), "%s macaddr=%02x:%02x:%02x:%02x:%02x:%02x", info_str, diff --git a/hw/eepro100.c b/hw/eepro100.c index cb3ca09..a7861ca 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1776,7 +1776,8 @@ static void nic_init(PCIBus * bus, NICInfo * nd, nic_reset(s); - s->vc = qemu_new_vlan_client(nd->vlan, nic_receive, nic_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + nic_receive, nic_can_receive, s); snprintf(s->vc->info_str, sizeof(s->vc->info_str), "eepro100 pci macaddr=%02x:%02x:%02x:%02x:%02x:%02x", diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index cf55161..539ec6d 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -572,7 +572,7 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env, eth->ethregs = cpu_register_io_memory(0, eth_read, eth_write, eth); cpu_register_physical_memory (base, 0x5c, eth->ethregs); - eth->vc = qemu_new_vlan_client(nd->vlan, + eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, eth_receive, eth_can_receive, eth); return dma; diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c index 0049860..7e3afa5 100644 --- a/hw/mcf_fec.c +++ b/hw/mcf_fec.c @@ -452,7 +452,7 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq) mcf_fec_writefn, s); cpu_register_physical_memory(base, 0x400, iomemtype); - s->vc = qemu_new_vlan_client(nd->vlan, mcf_fec_receive, - mcf_fec_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + mcf_fec_receive, mcf_fec_can_receive, s); memcpy(s->macaddr, nd->macaddr, 6); } diff --git a/hw/mipsnet.c b/hw/mipsnet.c index af560f8..549e6f3 100644 --- a/hw/mipsnet.c +++ b/hw/mipsnet.c @@ -250,8 +250,8 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd) s->irq = irq; s->nd = nd; if (nd && nd->vlan) { - s->vc = qemu_new_vlan_client(nd->vlan, mipsnet_receive, - mipsnet_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + mipsnet_receive, mipsnet_can_receive, s); } else { s->vc = NULL; } diff --git a/hw/musicpal.c b/hw/musicpal.c index c5a5b6f..d172a11 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -718,7 +718,8 @@ static void mv88w8618_eth_init(NICInfo *nd, uint32_t base, qemu_irq irq) if (!s) return; s->irq = irq; - s->vc = qemu_new_vlan_client(nd->vlan, eth_receive, eth_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + eth_receive, eth_can_receive, s); iomemtype = cpu_register_io_memory(0, mv88w8618_eth_readfn, mv88w8618_eth_writefn, s); cpu_register_physical_memory(base, MP_ETH_SIZE, iomemtype); diff --git a/hw/ne2000.c b/hw/ne2000.c index 3f0ccf5..dc97989 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -741,8 +741,8 @@ void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd) ne2000_reset(s); - s->vc = qemu_new_vlan_client(nd->vlan, ne2000_receive, - ne2000_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + ne2000_receive, ne2000_can_receive, s); snprintf(s->vc->info_str, sizeof(s->vc->info_str), "ne2000 macaddr=%02x:%02x:%02x:%02x:%02x:%02x", @@ -811,8 +811,8 @@ void pci_ne2000_init(PCIBus *bus, NICInfo *nd, int devfn) s->pci_dev = (PCIDevice *)d; memcpy(s->macaddr, nd->macaddr, 6); ne2000_reset(s); - s->vc = qemu_new_vlan_client(nd->vlan, ne2000_receive, - ne2000_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + ne2000_receive, ne2000_can_receive, s); snprintf(s->vc->info_str, sizeof(s->vc->info_str), "ne2000 pci macaddr=%02x:%02x:%02x:%02x:%02x:%02x", diff --git a/hw/pcnet.c b/hw/pcnet.c index 30c453c..e961a06 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1936,8 +1936,8 @@ static void pcnet_common_init(PCNetState *d, NICInfo *nd, const char *info_str) d->nd = nd; if (nd && nd->vlan) { - d->vc = qemu_new_vlan_client(nd->vlan, pcnet_receive, - pcnet_can_receive, d); + d->vc = qemu_new_vlan_client(nd->vlan, nd->model, + pcnet_receive, pcnet_can_receive, d); snprintf(d->vc->info_str, sizeof(d->vc->info_str), "pcnet macaddr=%02x:%02x:%02x:%02x:%02x:%02x", diff --git a/hw/rtl8139.c b/hw/rtl8139.c index c3ab854..39f3209 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3438,8 +3438,8 @@ void pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn) s->pci_dev = (PCIDevice *)d; memcpy(s->macaddr, nd->macaddr, 6); rtl8139_reset(s); - s->vc = qemu_new_vlan_client(nd->vlan, rtl8139_receive, - rtl8139_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + rtl8139_receive, rtl8139_can_receive, s); snprintf(s->vc->info_str, sizeof(s->vc->info_str), "rtl8139 pci macaddr=%02x:%02x:%02x:%02x:%02x:%02x", diff --git a/hw/smc91c111.c b/hw/smc91c111.c index a517033..fadd151 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -704,7 +704,7 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq) smc91c111_reset(s); - s->vc = qemu_new_vlan_client(nd->vlan, smc91c111_receive, - smc91c111_can_receive, s); + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, + smc91c111_receive, smc91c111_can_receive, s); /* ??? Save/restore. */ } diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index 09d92b1..bd8dcd9 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -397,8 +397,8 @@ void stellaris_enet_init(NICInfo *nd, uint32_t base, qemu_irq irq) memcpy(s->macaddr, nd->macaddr, 6); if (nd->vlan) - s->vc = qemu_new_vlan_client(nd->vlan, 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); stellaris_enet_reset(s); register_savevm("stellaris_enet", -1, 1, diff --git a/hw/usb-net.c b/hw/usb-net.c index f16a0a5..40ee41b 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1453,7 +1453,7 @@ USBDevice *usb_net_init(NICInfo *nd) pstrcpy(s->dev.devname, sizeof(s->dev.devname), "QEMU USB Network Interface"); - s->vc = qemu_new_vlan_client(nd->vlan, + s->vc = qemu_new_vlan_client(nd->vlan, nd->model, usbnet_receive, usbnet_can_receive, s); snprintf(s->usbstring_mac, sizeof(s->usbstring_mac), diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 1f45b2d..4500fab 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -315,8 +315,8 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n->rx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_rx); n->tx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_tx); memcpy(n->mac, nd->macaddr, 6); - n->vc = qemu_new_vlan_client(nd->vlan, 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); n->tx_timer = qemu_new_timer(vm_clock, virtio_net_tx_timer, n); n->tx_timer_active = 0; -- cgit v1.1