From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShHR8-0000wI-4Y for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:42:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ShHR3-0002Hz-A1 for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:42:53 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:46518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShHR3-0002Hj-27 for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:42:49 -0400 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Jun 2012 03:42:47 -0600 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 04D4DC90058 for ; Wed, 20 Jun 2012 05:42:41 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5K9ggJW129824 for ; Wed, 20 Jun 2012 05:42:42 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5K9gfKO028933 for ; Wed, 20 Jun 2012 06:42:41 -0300 From: zwu.kernel@gmail.com Date: Wed, 20 Jun 2012 17:42:07 +0800 Message-Id: <1340185341-30803-4-git-send-email-zwu.kernel@gmail.com> In-Reply-To: <1340185341-30803-1-git-send-email-zwu.kernel@gmail.com> References: <1340185341-30803-1-git-send-email-zwu.kernel@gmail.com> Subject: [Qemu-devel] [PATCH v6 03/17] net: Look up 'vlan' net clients using hubs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, aliguori@us.ibm.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com From: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu --- net.c | 28 +--------------------------- net/hub.c | 24 ++++++++++++++++++++++++ net/hub.h | 2 ++ net/slirp.c | 5 +++-- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/net.c b/net.c index 9a63d22..f80a0c0 100644 --- a/net.c +++ b/net.c @@ -312,32 +312,6 @@ void qemu_del_vlan_client(VLANClientState *vc) qemu_free_vlan_client(vc); } -VLANClientState * -qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id, - const char *client_str) -{ - VLANState *vlan; - VLANClientState *vc; - - vlan = qemu_find_vlan(vlan_id, 0); - if (!vlan) { - monitor_printf(mon, "unknown VLAN %d\n", vlan_id); - return NULL; - } - - QTAILQ_FOREACH(vc, &vlan->clients, next) { - if (!strcmp(vc->name, client_str)) { - break; - } - } - if (!vc) { - monitor_printf(mon, "can't find device %s on VLAN %d\n", - client_str, vlan_id); - } - - return vc; -} - void qemu_foreach_nic(qemu_nic_foreach func, void *opaque) { VLANClientState *nc; @@ -1226,7 +1200,7 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict) int vlan_id = qdict_get_int(qdict, "vlan_id"); const char *device = qdict_get_str(qdict, "device"); - vc = qemu_find_vlan_client_by_name(mon, vlan_id, device); + vc = net_hub_find_client_by_name(vlan_id, device); if (!vc) { return; } diff --git a/net/hub.c b/net/hub.c index 28ff45c..56efc2c 100644 --- a/net/hub.c +++ b/net/hub.c @@ -160,6 +160,30 @@ VLANClientState *net_hub_add_port(unsigned int hub_id) } /** + * Find a specific client on a hub + */ +VLANClientState *net_hub_find_client_by_name(unsigned 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 bf8798b..e149e04 100644 --- a/net/hub.h +++ b/net/hub.h @@ -18,6 +18,8 @@ #include "qemu-common.h" VLANClientState *net_hub_add_port(unsigned int hub_id); +VLANClientState *net_hub_find_client_by_name(unsigned int hub_id, + const char *name); void net_hub_info(Monitor *mon); int net_hub_id_for_client(VLANClientState *nc, unsigned int *id); diff --git a/net/slirp.c b/net/slirp.c index 70e7c94..c8c557a 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -29,6 +29,7 @@ #include #endif #include "net.h" +#include "net/hub.h" #include "monitor.h" #include "qemu_socket.h" #include "slirp/libslirp.h" @@ -283,7 +284,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; } @@ -648,7 +649,7 @@ void do_info_usernet(Monitor *mon) QTAILQ_FOREACH(s, &slirp_stacks, entry) { monitor_printf(mon, "VLAN %d (%s):\n", - s->nc.vlan ? s->nc.vlan->id : -1, + -1, /* TODO */ s->nc.name); slirp_connection_info(s->slirp, mon); } -- 1.7.6