diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-07-24 16:35:06 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-08-01 12:28:51 +0100 |
| commit | 90d87a33c700e0634bc4343fa7a034f909662254 (patch) | |
| tree | a5e8350cae5e67f399a3de2203a0185d0a68bafb /net/slirp.c | |
| parent | d33d93b2c40b820c2cfab1e2e6da631f12091957 (diff) | |
net: Look up 'vlan' net clients using hubs
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'net/slirp.c')
| -rw-r--r-- | net/slirp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/slirp.c b/net/slirp.c index 97e380cb27..7682ac7b52 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -30,6 +30,7 @@ #include <sys/wait.h> #endif #include "net.h" +#include "net/hub.h" #include "monitor.h" #include "qemu_socket.h" #include "slirp/libslirp.h" @@ -284,7 +285,7 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *vlan, if (vlan) { VLANClientState *nc; - nc = qemu_find_vlan_client_by_name(mon, strtol(vlan, NULL, 0), stack); + nc = net_hub_find_client_by_name(strtol(vlan, NULL, 0), stack); if (!nc) { return NULL; } @@ -679,8 +680,10 @@ void do_info_usernet(Monitor *mon) SlirpState *s; QTAILQ_FOREACH(s, &slirp_stacks, entry) { + int id; + bool got_vlan_id = net_hub_id_for_client(&s->nc, &id) == 0; monitor_printf(mon, "VLAN %d (%s):\n", - s->nc.vlan ? s->nc.vlan->id : -1, + got_vlan_id ? id : -1, s->nc.name); slirp_connection_info(s->slirp, mon); } |