summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2012-07-24 16:35:06 +0100
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2012-08-01 12:28:51 +0100
commit90d87a33c700e0634bc4343fa7a034f909662254 (patch)
treea5e8350cae5e67f399a3de2203a0185d0a68bafb /net
parentd33d93b2c40b820c2cfab1e2e6da631f12091957 (diff)
downloadhqemu-90d87a33c700e0634bc4343fa7a034f909662254.zip
hqemu-90d87a33c700e0634bc4343fa7a034f909662254.tar.gz
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')
-rw-r--r--net/hub.c23
-rw-r--r--net/hub.h1
-rw-r--r--net/slirp.c7
3 files changed, 29 insertions, 2 deletions
diff --git a/net/hub.c b/net/hub.c
index ee9d878..9806a59 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -165,6 +165,29 @@ VLANClientState *net_hub_add_port(int hub_id, const char *name)
}
/**
+ * Find a specific client on a hub
+ */
+VLANClientState *net_hub_find_client_by_name(int hub_id, const char *name)
+{
+ NetHub *hub;
+ NetHubPort *port;
+ VLANClientState *peer;
+
+ QLIST_FOREACH(hub, &hubs, next) {
+ if (hub->id == hub_id) {
+ QLIST_FOREACH(port, &hub->ports, next) {
+ peer = port->nc.peer;
+
+ if (peer && strcmp(peer->name, name) == 0) {
+ return peer;
+ }
+ }
+ }
+ }
+ return NULL;
+}
+
+/**
* Print hub configuration
*/
void net_hub_info(Monitor *mon)
diff --git a/net/hub.h b/net/hub.h
index a5fa2ba..6770850 100644
--- a/net/hub.h
+++ b/net/hub.h
@@ -20,6 +20,7 @@
int net_init_hubport(const NetClientOptions *opts, const char *name,
VLANClientState *peer);
VLANClientState *net_hub_add_port(int hub_id, const char *name);
+VLANClientState *net_hub_find_client_by_name(int hub_id, const char *name);
void net_hub_info(Monitor *mon);
int net_hub_id_for_client(VLANClientState *nc, int *id);
diff --git a/net/slirp.c b/net/slirp.c
index 97e380c..7682ac7 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);
}
OpenPOWER on IntegriCloud