diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2009-10-22 17:43:38 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-27 12:29:00 -0500 |
| commit | bb6e636443d49f7444f49ab64dc7ec6aae1493a7 (patch) | |
| tree | 67f2e6436aec330d4ebbd3430e3c0dd9ad84f0f8 /hw | |
| parent | baf74c95802347e218721dbaa331997e11fbf903 (diff) | |
| download | focaccia-qemu-bb6e636443d49f7444f49ab64dc7ec6aae1493a7.tar.gz focaccia-qemu-bb6e636443d49f7444f49ab64dc7ec6aae1493a7.zip | |
net: add a client type code
This is so as to allow APIs which operate on specific client types without having to add a function table entry which is only implemented by a single client type. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/dp8393x.c | 3 | ||||
| -rw-r--r-- | hw/etraxfs_eth.c | 3 | ||||
| -rw-r--r-- | hw/mcf_fec.c | 3 | ||||
| -rw-r--r-- | hw/mipsnet.c | 3 | ||||
| -rw-r--r-- | hw/usb-net.c | 3 | ||||
| -rw-r--r-- | hw/xen_nic.c | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/hw/dp8393x.c b/hw/dp8393x.c index e4caab02cf..5622170a08 100644 --- a/hw/dp8393x.c +++ b/hw/dp8393x.c @@ -889,7 +889,8 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, s->watchdog = qemu_new_timer(vm_clock, dp8393x_watchdog, s); s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */ - s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev, + s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, + nd->vlan, nd->netdev, nd->model, nd->name, nic_can_receive, nic_receive, NULL, nic_cleanup, s); diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index a411dab0dd..2a583a3cb0 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -590,7 +590,8 @@ void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr) eth->ethregs = cpu_register_io_memory(eth_read, eth_write, eth); cpu_register_physical_memory (base, 0x5c, eth->ethregs); - eth->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev, + eth->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, + nd->vlan, nd->netdev, nd->model, nd->name, eth_can_receive, eth_receive, NULL, eth_cleanup, eth); diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c index f9f437af67..0567bcdcd4 100644 --- a/hw/mcf_fec.c +++ b/hw/mcf_fec.c @@ -462,7 +462,8 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq) mcf_fec_writefn, s); cpu_register_physical_memory(base, 0x400, s->mmio_index); - s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev, + s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, + nd->vlan, nd->netdev, nd->model, nd->name, mcf_fec_can_receive, mcf_fec_receive, NULL, mcf_fec_cleanup, s); diff --git a/hw/mipsnet.c b/hw/mipsnet.c index ea8b570795..d32099f664 100644 --- a/hw/mipsnet.c +++ b/hw/mipsnet.c @@ -263,7 +263,8 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd) s->io_base = base; s->irq = irq; if (nd) { - s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev, + s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, + nd->vlan, nd->netdev, nd->model, nd->name, mipsnet_can_receive, mipsnet_receive, NULL, mipsnet_cleanup, s); diff --git a/hw/usb-net.c b/hw/usb-net.c index 5c753e0872..2393812858 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1460,7 +1460,8 @@ USBDevice *usb_net_init(NICInfo *nd) memcpy(s->mac, nd->macaddr, 6); - s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev, + s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, + nd->vlan, nd->netdev, nd->model, nd->name, usbnet_can_receive, usbnet_receive, diff --git a/hw/xen_nic.c b/hw/xen_nic.c index b09b48a22f..2a179f0893 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -301,7 +301,8 @@ static int net_init(struct XenDevice *xendev) return -1; vlan = qemu_find_vlan(netdev->xendev.dev, 1); - netdev->vs = qemu_new_vlan_client(vlan, NULL, "xen", NULL, + netdev->vs = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, + vlan, NULL, "xen", NULL, net_rx_ok, net_rx_packet, NULL, NULL, netdev); snprintf(netdev->vs->info_str, sizeof(netdev->vs->info_str), |