[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 04/17] hub: Check that hubs are configured correc
From: |
zwu . kernel |
Subject: |
[Qemu-devel] [PATCH v5 04/17] hub: Check that hubs are configured correctly |
Date: |
Tue, 19 Jun 2012 00:59:06 +0800 |
From: Stefan Hajnoczi <address@hidden>
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 <address@hidden>
Signed-off-by: Zhi Yong Wu <address@hidden>
---
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 */
--
1.7.6
- [Qemu-devel] [PATCH v5 00/17] hub-based networking patches, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 01/17] net: Add a hub net client, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 03/17] net: Look up 'vlan' net clients using hubs, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 07/17] net: Remove vlan code from net.c, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 08/17] net: Remove VLANState, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 12/17] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 05/17] net: Drop vlan argument to qemu_new_net_client(), zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 09/17] net: Rename non_vlan_clients to net_clients, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 14/17] net: cleanup deliver/deliver_iov func pointers, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 06/17] net: Remove vlan qdev property, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 04/17] hub: Check that hubs are configured correctly,
zwu . kernel <=
- [Qemu-devel] [PATCH v5 02/17] net: Use hubs for the vlan feature, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 10/17] net: Rename VLANClientState to NetClientState, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 11/17] net: Rename vc local variables to nc, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 16/17] hub: add the support for hub own flow control, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 17/17] net: roll back qdev_prop_vlan, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 13/17] net: Make "info network" output more readable info, zwu . kernel, 2012/06/18
- [Qemu-devel] [PATCH v5 15/17] net: determine if packets can be sent before net queue deliver packets, zwu . kernel, 2012/06/18