From patchwork Mon Jun 18 16:59:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 165532 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 A7E58B7096 for ; Tue, 19 Jun 2012 03:02:56 +1000 (EST) Received: from localhost ([::1]:46473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgfLq-0004Rp-Jc for incoming@patchwork.ozlabs.org; Mon, 18 Jun 2012 13:02:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgfKp-0002XO-KV for qemu-devel@nongnu.org; Mon, 18 Jun 2012 13:01:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SgfKk-00026R-H3 for qemu-devel@nongnu.org; Mon, 18 Jun 2012 13:01:51 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:33616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgfKk-000268-Ac for qemu-devel@nongnu.org; Mon, 18 Jun 2012 13:01:46 -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 ; Mon, 18 Jun 2012 11:01:43 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 18 Jun 2012 11:00:31 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id A56DC19D80C6 for ; Mon, 18 Jun 2012 16:59:57 +0000 (WET) 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 q5IGxmjS150650 for ; Mon, 18 Jun 2012 10:59:48 -0600 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 q5IGxlvR012611 for ; Mon, 18 Jun 2012 10:59:47 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.27]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q5IGxhGN012227; Mon, 18 Jun 2012 10:59:44 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Tue, 19 Jun 2012 00:59:42 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Tue, 19 Jun 2012 00:59:06 +0800 Message-Id: <1340038759-27796-5-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1340038759-27796-1-git-send-email-zwu.kernel@gmail.com> References: <1340038759-27796-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12061817-1780-0000-0000-0000068DF419 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000282; HX=3.00000190; KW=3.00000007; PH=3.00000001; SC=3.00000002; SDB=6.00149167; UDB=6.00033951; UTC=2012-06-18 17:01:34 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, aliguori@us.ibm.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH v5 04/17] hub: Check that hubs are configured correctly 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 Checks can be performed to make sure that hubs have at least one NIC and one host device, warning the user if this is not the case. Configurations which do not meet this rule tend to be broken but just emit a warning. This patch preserves compatibility with the checks performed by net core on vlans. Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu --- net.c | 25 +------------------------ net/hub.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ net/hub.h | 1 + 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/net.c b/net.c index f80a0c0..d6bb480 100644 --- a/net.c +++ b/net.c @@ -1356,7 +1356,6 @@ void net_cleanup(void) void net_check_clients(void) { - VLANState *vlan; VLANClientState *vc; int i; @@ -1372,30 +1371,8 @@ void net_check_clients(void) return; } - QTAILQ_FOREACH(vlan, &vlans, next) { - int has_nic = 0, has_host_dev = 0; + net_hub_check_clients(); - QTAILQ_FOREACH(vc, &vlan->clients, next) { - switch (vc->info->type) { - case NET_CLIENT_TYPE_NIC: - has_nic = 1; - break; - case NET_CLIENT_TYPE_USER: - case NET_CLIENT_TYPE_TAP: - case NET_CLIENT_TYPE_SOCKET: - case NET_CLIENT_TYPE_VDE: - has_host_dev = 1; - break; - default: ; - } - } - if (has_host_dev && !has_nic) - fprintf(stderr, "Warning: vlan %d with no nics\n", vlan->id); - if (has_nic && !has_host_dev) - fprintf(stderr, - "Warning: vlan %d is not connected to host network\n", - vlan->id); - } QTAILQ_FOREACH(vc, &non_vlan_clients, next) { if (!vc->peer) { fprintf(stderr, "Warning: %s %s has no peer\n", diff --git a/net/hub.c b/net/hub.c index 56efc2c..e4a3980 100644 --- a/net/hub.c +++ b/net/hub.c @@ -223,3 +223,48 @@ int net_hub_id_for_client(VLANClientState *nc, unsigned int *id) } return -ENOENT; } + +/** + * Warn if hub configurations are likely wrong + */ +void net_hub_check_clients(void) +{ + NetHub *hub; + NetHubPort *port; + VLANClientState *peer; + + QLIST_FOREACH(hub, &hubs, next) { + int has_nic = 0, has_host_dev = 0; + + QLIST_FOREACH(port, &hub->ports, next) { + peer = port->nc.peer; + if (!peer) { + fprintf(stderr, "Warning: hub port %s has no peer\n", + port->nc.name); + continue; + } + + switch (peer->info->type) { + case NET_CLIENT_TYPE_NIC: + has_nic = 1; + break; + case NET_CLIENT_TYPE_USER: + case NET_CLIENT_TYPE_TAP: + case NET_CLIENT_TYPE_SOCKET: + case NET_CLIENT_TYPE_VDE: + has_host_dev = 1; + break; + default: + break; + } + } + if (has_host_dev && !has_nic) { + fprintf(stderr, "Warning: vlan %u with no nics\n", hub->id); + } + if (has_nic && !has_host_dev) { + fprintf(stderr, + "Warning: vlan %u is not connected to host network\n", + hub->id); + } + } +} diff --git a/net/hub.h b/net/hub.h index e149e04..10bf036 100644 --- a/net/hub.h +++ b/net/hub.h @@ -22,5 +22,6 @@ 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); +void net_hub_check_clients(void); #endif /* NET_HUB_H */