From patchwork Fri Jul 20 12:01:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 172212 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 C43472C00BC for ; Fri, 20 Jul 2012 22:04:27 +1000 (EST) Received: from localhost ([::1]:32866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBwX-000866-My for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 08:04:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBug-0004au-Dr for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsBue-0003ZH-VQ for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:30 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:42607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBue-0003Te-NV for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:28 -0400 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Jul 2012 13:02:05 +0100 Received: from d06nrmr1407.portsmouth.uk.ibm.com (9.149.38.185) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 20 Jul 2012 13:02:03 +0100 Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6KC22rS2621614 for ; Fri, 20 Jul 2012 13:02:02 +0100 Received: from d06av11.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6KC21e6025774 for ; Fri, 20 Jul 2012 06:02:02 -0600 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6KC2181025767; Fri, 20 Jul 2012 06:02:01 -0600 From: Stefan Hajnoczi To: Date: Fri, 20 Jul 2012 13:01:36 +0100 Message-Id: <1342785709-3152-4-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342785709-3152-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1342785709-3152-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072012-4966-0000-0000-000002FFAF03 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.106 Cc: Paolo Bonzini , Zhi Yong Wu , lersek@redhat.com, Stefan Hajnoczi , Zhi Yong Wu Subject: [Qemu-devel] [PATCH 03/16] 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 Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu Reviewed-by: Laszlo Ersek --- net.c | 28 +--------------------------- net/hub.c | 24 ++++++++++++++++++++++++ net/hub.h | 2 ++ net/slirp.c | 7 +++++-- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/net.c b/net.c index f2752c7..2a8c5c5 100644 --- a/net.c +++ b/net.c @@ -316,32 +316,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; @@ -995,7 +969,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 e0ce476..104dd4f 100644 --- a/net/hub.c +++ b/net/hub.c @@ -165,6 +165,30 @@ VLANClientState *net_hub_add_port(unsigned int hub_id, const char *name) } /** + * 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 b642c13..1b9db52 100644 --- a/net/hub.h +++ b/net/hub.h @@ -20,6 +20,8 @@ int net_init_hubport(const NetClientOptions *opts, const char *name, VLANClientState *peer); VLANClientState *net_hub_add_port(unsigned int hub_id, const char *name); +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 97e380c..c753b02 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -30,6 +30,7 @@ #include #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) { + unsigned 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); }