aboutsummaryrefslogtreecommitdiffstats
path: root/hw/mipsnet.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-08 19:58:30 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-15 09:32:02 -0500
commit283c7c63f5c56c4d0340fb39093fb47e75cb122e (patch)
treec07299f36322356dac05fb41d3059e614e0073a2 /hw/mipsnet.c
parent5869c4d515128cd3a938a7346a8037abcc232220 (diff)
net: allow NICs to be connected to netdevs
Introduce a 'peer' member to VLANClientState as an alternative to a vlan. The idea being that packets are transfered directly from peer clients rather than going through a vlan. Patchworks-ID: 35516 Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mipsnet.c')
-rw-r--r--hw/mipsnet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/mipsnet.c b/hw/mipsnet.c
index e98c57699..ea8b57079 100644
--- a/hw/mipsnet.c
+++ b/hw/mipsnet.c
@@ -262,8 +262,9 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
s->io_base = base;
s->irq = irq;
- if (nd && nd->vlan) {
- s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
+ if (nd) {
+ s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev,
+ nd->model, nd->name,
mipsnet_can_receive, mipsnet_receive,
NULL, mipsnet_cleanup, s);
} else {