From patchwork Fri Mar 9 09:00:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 145691 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3FF09B6FA2 for ; Fri, 9 Mar 2012 20:01:32 +1100 (EST) Received: from localhost ([::1]:55765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5vhZ-0007Ok-Qz for incoming@patchwork.ozlabs.org; Fri, 09 Mar 2012 04:01:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5vhE-0007OK-Qv for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5vh9-000862-Qx for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:08 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:50463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5vh9-00085t-KT for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:03 -0500 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Mar 2012 02:01:01 -0700 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 9 Mar 2012 02:00:57 -0700 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 277D83E40048 for ; Fri, 9 Mar 2012 02:00:57 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2990sR9180962 for ; Fri, 9 Mar 2012 02:00:55 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2990sAh017080 for ; Fri, 9 Mar 2012 02:00:54 -0700 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q2990oYh016502; Fri, 9 Mar 2012 02:00:50 -0700 Received: by us.ibm.com (sSMTP sendmail emulation); Fri, 9 Mar 2012 17:00:48 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2012 17:00:16 +0800 Message-Id: <1331283625-26439-4-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1331283625-26439-1-git-send-email-zwu.kernel@gmail.com> References: <1331283625-26439-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030909-3270-0000-0000-000004A9DF90 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.150 Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, linuxram@us.ibm.com, zwu.kernel@gmail.com, ryanh@us.ibm.com, luowenj@cn.ibm.com, Zhi Yong Wu Subject: [Qemu-devel] [PATCH v1 03/12] net: Look up 'vlan' net clients using hubs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 4a71f3d..181080e 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; @@ -1223,7 +1197,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 b3ac2ef..1dc23f5 100644 --- a/net/hub.c +++ b/net/hub.c @@ -163,6 +163,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 3ca05dc..60d4cae 100644 --- a/net/hub.h +++ b/net/hub.h @@ -17,6 +17,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 34835fa..eb5f455 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; } @@ -647,7 +648,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); }