[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/15] hub: Check that hubs are configured correc
From: |
zwu . kernel |
Subject: |
[Qemu-devel] [PATCH v2 04/15] hub: Check that hubs are configured correctly |
Date: |
Wed, 23 May 2012 23:13:54 +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 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 */
--
1.7.6
- [Qemu-devel] [PATCH v2 13/15] net: Remove obsolete vlan info, (continued)
[Qemu-devel] [PATCH v2 09/15] net: Rename non_vlan_clients to net_clients, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 01/15] net: Add a hub net client, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 02/15] net: Use hubs for the vlan feature, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 12/15] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 03/15] net: Look up 'vlan' net clients using hubs, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 04/15] hub: Check that hubs are configured correctly,
zwu . kernel <=
[Qemu-devel] [PATCH v2 07/15] net: Remove vlan code from net.c, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 10/15] net: Rename VLANClientState to NetClientState, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 14/15] net: cleanup deliver/deliver_iov func pointers, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 15/15] net: invoke qemu_can_send_packet only before net queue sending function, zwu . kernel, 2012/05/23
[Qemu-devel] [PATCH v2 05/15] net: Drop vlan argument to qemu_new_net_client(), zwu . kernel, 2012/05/23