From patchwork Thu May 24 17:59:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 161178 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 9AED3B6EE7 for ; Fri, 25 May 2012 04:01:26 +1000 (EST) Received: from localhost ([::1]:34360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcLk-0005fy-J2 for incoming@patchwork.ozlabs.org; Thu, 24 May 2012 14:01:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcLb-0005fe-Ke for qemu-devel@nongnu.org; Thu, 24 May 2012 14:01:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXcLW-0002rb-2n for qemu-devel@nongnu.org; Thu, 24 May 2012 14:01:15 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:44824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcLV-0002qj-UI for qemu-devel@nongnu.org; Thu, 24 May 2012 14:01:09 -0400 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 24 May 2012 14:01:06 -0400 Received: from d01dlp02.pok.ibm.com (9.56.224.85) by e6.ny.us.ibm.com (192.168.1.106) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 24 May 2012 13:59:58 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 9C8056E805D for ; Thu, 24 May 2012 13:59:54 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q4OHxrdT24838290 for ; Thu, 24 May 2012 13:59:54 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q4OHxrhg015695 for ; Thu, 24 May 2012 14:59:53 -0300 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q4OHxnrG015004; Thu, 24 May 2012 14:59:50 -0300 Received: by us.ibm.com (sSMTP sendmail emulation); Fri, 25 May 2012 01:59:41 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 01:59:10 +0800 Message-Id: <1337882362-20100-5-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> References: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12052417-1976-0000-0000-00000D82137E X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.146 Cc: pbonzini@redhat.com, wuzhy@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH v3 04/16] 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 d9c7eac..88b9e1f 100644 --- a/net.c +++ b/net.c @@ -1337,7 +1337,6 @@ void net_cleanup(void) void net_check_clients(void) { - VLANState *vlan; VLANClientState *vc; int i; @@ -1353,30 +1352,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 3cd1249..19c1169 100644 --- a/net/hub.c +++ b/net/hub.c @@ -222,3 +222,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 60d4cae..caa3b16 100644 --- a/net/hub.h +++ b/net/hub.h @@ -21,5 +21,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 */