[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 13/17] net: Make "info network" output more reada
From: |
zwu . kernel |
Subject: |
[Qemu-devel] [PATCH v5 13/17] net: Make "info network" output more readable info |
Date: |
Tue, 19 Jun 2012 00:59:15 +0800 |
From: Zhi Yong Wu <address@hidden>
Reviewed-by: Jan Kiszka <address@hidden>
Signed-off-by: Zhi Yong Wu <address@hidden>
---
net.c | 14 +++++++++-----
net.h | 1 +
net/hub.c | 23 +++++++++++++++++++++--
net/hub.h | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/net.c b/net.c
index e7d49b3..d0be471 100644
--- a/net.c
+++ b/net.c
@@ -1087,7 +1087,7 @@ void qmp_netdev_del(const char *id, Error **errp)
qemu_opts_del(qemu_opts_find(qemu_find_opts_err("netdev", errp), id));
}
-static void print_net_client(Monitor *mon, NetClientState *vc)
+void print_net_client(Monitor *mon, NetClientState *vc)
{
monitor_printf(mon, "%s: type=%s,%s\n", vc->name,
net_client_types[vc->info->type].type, vc->info_str);
@@ -1098,20 +1098,24 @@ void do_info_network(Monitor *mon)
NetClientState *nc, *peer;
net_client_type type;
- monitor_printf(mon, "Devices not on any VLAN:\n");
+ net_hub_info(mon);
+
QTAILQ_FOREACH(nc, &net_clients, next) {
peer = nc->peer;
type = nc->info->type;
+
+ if (net_hub_port_peer_nc(nc)) {
+ continue;
+ }
+
if (!peer || type == NET_CLIENT_TYPE_NIC) {
- monitor_printf(mon, " ");
print_net_client(mon, nc);
} /* else it's a netdev connected to a NIC, printed with the NIC */
if (peer && type == NET_CLIENT_TYPE_NIC) {
- monitor_printf(mon, " \\ ");
+ monitor_printf(mon, " \\ ");
print_net_client(mon, peer);
}
}
- net_hub_info(mon);
}
void qmp_set_link(const char *name, bool up, Error **errp)
diff --git a/net.h b/net.h
index 20fcc94..e1509f9 100644
--- a/net.h
+++ b/net.h
@@ -112,6 +112,7 @@ void qemu_check_nic_model(NICInfo *nd, const char *model);
int qemu_find_nic_model(NICInfo *nd, const char * const *models,
const char *default_model);
+void print_net_client(Monitor *mon, NetClientState *vc);
void do_info_network(Monitor *mon);
/* NIC info */
diff --git a/net/hub.c b/net/hub.c
index 122de69..230d86a 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -184,6 +184,25 @@ NetClientState *net_hub_find_client_by_name(unsigned int
hub_id,
}
/**
+ * Determine if one nc peers with one hub port
+ */
+bool net_hub_port_peer_nc(NetClientState *nc)
+{
+ NetHub *hub;
+ NetHubPort *port;
+
+ QLIST_FOREACH(hub, &hubs, next) {
+ QLIST_FOREACH(port, &hub->ports, next) {
+ if (nc == port->nc.peer) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+/**
* Print hub configuration
*/
void net_hub_info(Monitor *mon)
@@ -194,8 +213,8 @@ void net_hub_info(Monitor *mon)
QLIST_FOREACH(hub, &hubs, next) {
monitor_printf(mon, "hub %u\n", hub->id);
QLIST_FOREACH(port, &hub->ports, next) {
- monitor_printf(mon, " port %u peer %s\n", port->id,
- port->nc.peer ? port->nc.peer->name : "<none>");
+ monitor_printf(mon, " \\ ");
+ print_net_client(mon, port->nc.peer);
}
}
}
diff --git a/net/hub.h b/net/hub.h
index ff5024a..550189b 100644
--- a/net/hub.h
+++ b/net/hub.h
@@ -23,5 +23,6 @@ NetClientState *net_hub_find_client_by_name(unsigned int
hub_id,
void net_hub_info(Monitor *mon);
int net_hub_id_for_client(NetClientState *nc, unsigned int *id);
void net_hub_check_clients(void);
+bool net_hub_port_peer_nc(NetClientState *nc);
#endif /* NET_HUB_H */
--
1.7.6
- [Qemu-devel] [PATCH v5 05/17] net: Drop vlan argument to qemu_new_net_client(), (continued)
- [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, 2012/06/18
- [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 <=
- [Qemu-devel] [PATCH v5 15/17] net: determine if packets can be sent before net queue deliver packets, zwu . kernel, 2012/06/18