From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbPrc-0004At-7W for qemu-devel@nongnu.org; Mon, 04 Jun 2012 01:30:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbPra-0000OF-BX for qemu-devel@nongnu.org; Mon, 04 Jun 2012 01:29:59 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:45813) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbPra-0000Nt-7G for qemu-devel@nongnu.org; Mon, 04 Jun 2012 01:29:58 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Jun 2012 01:29:56 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 9DC8C38C803A for ; Mon, 4 Jun 2012 01:29:54 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q545Tsu6117064 for ; Mon, 4 Jun 2012 01:29:54 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q545TrSp024055 for ; Mon, 4 Jun 2012 01:29:54 -0400 From: zwu.kernel@gmail.com Date: Mon, 4 Jun 2012 13:29:15 +0800 Message-Id: <1338787767-3443-5-git-send-email-zwu.kernel@gmail.com> In-Reply-To: <1338787767-3443-1-git-send-email-zwu.kernel@gmail.com> References: <1338787767-3443-1-git-send-email-zwu.kernel@gmail.com> Subject: [Qemu-devel] [PATCH v4 04/16] hub: Check that hubs are configured correctly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com, Zhi Yong Wu , luowenj@cn.ibm.com, pbonzini@redhat.com 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 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 */ -- 1.7.6