From patchwork Wed May 23 15:13:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 160947 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 4A37AB6F9F for ; Thu, 24 May 2012 01:47:22 +1000 (EST) Received: from localhost ([::1]:49133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDmS-0003Zq-Cx for incoming@patchwork.ozlabs.org; Wed, 23 May 2012 11:47:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDmF-0003P5-Pu for qemu-devel@nongnu.org; Wed, 23 May 2012 11:47:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXDm5-0008NN-PT for qemu-devel@nongnu.org; Wed, 23 May 2012 11:47:07 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:43742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXDm5-0008MZ-5o for qemu-devel@nongnu.org; Wed, 23 May 2012 11:46:57 -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, 23 May 2012 09:46:54 -0600 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 23 May 2012 09:46:53 -0600 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 80684C9040F for ; Wed, 23 May 2012 11:14:43 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q4NFEjbo077988 for ; Wed, 23 May 2012 11:14:45 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q4NKjW9C020126 for ; Wed, 23 May 2012 16:45:36 -0400 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q4NKjO5E019177; Wed, 23 May 2012 16:45:25 -0400 Received: by us.ibm.com (sSMTP sendmail emulation); Wed, 23 May 2012 23:14:24 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Wed, 23 May 2012 23:13:53 +0800 Message-Id: <1337786045-2277-4-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1337786045-2277-1-git-send-email-zwu.kernel@gmail.com> References: <1337786045-2277-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12052315-1780-0000-0000-000005D24940 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000276; HX=3.00000188; KW=3.00000007; PH=3.00000001; SC=3.00000002; SDB=6.00141705; UDB=6.00032715; UTC=2012-05-23 15:46:54 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.152 Cc: pbonzini@redhat.com, wuzhy@linux.vnet.ibm.com, linuxram@us.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 03/15] 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 8c02559..d9c7eac 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 0d3df7f..3cd1249 100644 --- a/net/hub.c +++ b/net/hub.c @@ -159,6 +159,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 fa7c7fc..edb4621 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); }