From patchwork Tue Jul 24 15:35:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 172968 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 073FD2C0090 for ; Wed, 25 Jul 2012 02:48:49 +1000 (EST) Received: from localhost ([::1]:54424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SthAu-0004Tn-PP for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 11:37:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sth9a-0002Nz-3d for qemu-devel@nongnu.org; Tue, 24 Jul 2012 11:36:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sth9Q-0006cB-CB for qemu-devel@nongnu.org; Tue, 24 Jul 2012 11:36:05 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:58118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sth9Q-0006bj-39 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 11:35:56 -0400 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Jul 2012 16:35:51 +0100 Received: from d06nrmr1806.portsmouth.uk.ibm.com (9.149.39.193) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 24 Jul 2012 16:35:29 +0100 Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6OFZS7X2396292 for ; Tue, 24 Jul 2012 16:35:28 +0100 Received: from d06av05.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6OFZR4M028106 for ; Tue, 24 Jul 2012 09:35:28 -0600 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6OFZR86028100; Tue, 24 Jul 2012 09:35:27 -0600 From: Stefan Hajnoczi To: Date: Tue, 24 Jul 2012 16:35:07 +0100 Message-Id: <1343144119-18757-5-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343144119-18757-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1343144119-18757-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072415-0342-0000-0000-000002621E71 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.111 Cc: Paolo Bonzini , Zhi Yong Wu , Laszlo Ersek , Stefan Hajnoczi , Zhi Yong Wu Subject: [Qemu-devel] [PATCH v2 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 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 f88d38d..413dac4 100644 --- a/net.c +++ b/net.c @@ -1124,7 +1124,6 @@ void net_cleanup(void) void net_check_clients(void) { - VLANState *vlan; VLANClientState *vc; int i; @@ -1140,30 +1139,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_OPTIONS_KIND_NIC: - has_nic = 1; - break; - case NET_CLIENT_OPTIONS_KIND_USER: - case NET_CLIENT_OPTIONS_KIND_TAP: - case NET_CLIENT_OPTIONS_KIND_SOCKET: - case NET_CLIENT_OPTIONS_KIND_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 9806a59..5cdd8c9 100644 --- a/net/hub.c +++ b/net/hub.c @@ -244,3 +244,48 @@ int net_init_hubport(const NetClientOptions *opts, const char *name, net_hub_add_port(hubport->hubid, name); return 0; } + +/** + * 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_OPTIONS_KIND_NIC: + has_nic = 1; + break; + case NET_CLIENT_OPTIONS_KIND_USER: + case NET_CLIENT_OPTIONS_KIND_TAP: + case NET_CLIENT_OPTIONS_KIND_SOCKET: + case NET_CLIENT_OPTIONS_KIND_VDE: + has_host_dev = 1; + break; + default: + break; + } + } + if (has_host_dev && !has_nic) { + fprintf(stderr, "Warning: vlan %d with no nics\n", hub->id); + } + if (has_nic && !has_host_dev) { + fprintf(stderr, + "Warning: vlan %d is not connected to host network\n", + hub->id); + } + } +} diff --git a/net/hub.h b/net/hub.h index 6770850..9973da3 100644 --- a/net/hub.h +++ b/net/hub.h @@ -23,5 +23,6 @@ VLANClientState *net_hub_add_port(int hub_id, const char *name); VLANClientState *net_hub_find_client_by_name(int hub_id, const char *name); void net_hub_info(Monitor *mon); int net_hub_id_for_client(VLANClientState *nc, int *id); +void net_hub_check_clients(void); #endif /* NET_HUB_H */