summaryrefslogtreecommitdiffstats
path: root/hw/virtio-net.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-07 17:42:25 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-07 17:42:25 +0000
commitbf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db (patch)
tree039ac39a81763f10008b429ab1ef12577e1bd737 /hw/virtio-net.c
parentf7b4a940a430da0e2d48b74e85a8a941c1c2fabc (diff)
downloadhqemu-bf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db.zip
hqemu-bf38c1a0e1d7ebbe0930d8926dbc499b88a2d7db.tar.gz
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 <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6216 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/virtio-net.c')
-rw-r--r--hw/virtio-net.c4
1 files changed, 2 insertions, 2 deletions
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;
OpenPOWER on IntegriCloud