[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/16] net: Make "info network" output more readable
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 13/16] net: Make "info network" output more readable info |
Date: |
Fri, 20 Jul 2012 13:01:46 +0100 |
From: Zhi Yong Wu <address@hidden>
Reviewed-by: Jan Kiszka <address@hidden>
Signed-off-by: Zhi Yong Wu <address@hidden>
Signed-off-by: Stefan Hajnoczi <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 cdc6cc7..2eca563 100644
--- a/net.c
+++ b/net.c
@@ -856,7 +856,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 *nc)
+void print_net_client(Monitor *mon, NetClientState *nc)
{
monitor_printf(mon, "%s: type=%s,%s\n", nc->name,
NetClientOptionsKind_lookup[nc->info->type], nc->info_str);
@@ -867,20 +867,24 @@ void do_info_network(Monitor *mon)
NetClientState *nc, *peer;
NetClientOptionsKind 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_OPTIONS_KIND_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_OPTIONS_KIND_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 7e629d3..c819de4 100644
--- a/net.h
+++ b/net.h
@@ -100,6 +100,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 1e88fb2..f697a78 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -214,6 +214,25 @@ NetClientState *net_hub_port_find(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)
@@ -224,8 +243,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 d47dc96..83af09b 100644
--- a/net/hub.h
+++ b/net/hub.h
@@ -26,5 +26,6 @@ void net_hub_info(Monitor *mon);
int net_hub_id_for_client(NetClientState *nc, unsigned int *id);
void net_hub_check_clients(void);
NetClientState *net_hub_port_find(unsigned int hub_id);
+bool net_hub_port_peer_nc(NetClientState *nc);
#endif /* NET_HUB_H */
--
1.7.10.4
- [Qemu-devel] [PATCH 06/16] net: Convert qdev_prop_vlan to peer with hub, (continued)
- [Qemu-devel] [PATCH 06/16] net: Convert qdev_prop_vlan to peer with hub, Stefan Hajnoczi, 2012/07/20
- [Qemu-devel] [PATCH 11/16] net: Rename vc local variables to nc, Stefan Hajnoczi, 2012/07/20
- [Qemu-devel] [PATCH 16/16] hub: add the support for hub own flow control, Stefan Hajnoczi, 2012/07/20
- [Qemu-devel] [PATCH 02/16] net: Use hubs for the vlan feature, Stefan Hajnoczi, 2012/07/20
- [Qemu-devel] [PATCH 09/16] net: Rename non_vlan_clients to net_clients, Stefan Hajnoczi, 2012/07/20
- [Qemu-devel] [PATCH 13/16] net: Make "info network" output more readable info,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 12/16] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), Stefan Hajnoczi, 2012/07/20
- [Qemu-devel] [PATCH 04/16] hub: Check that hubs are configured correctly, Stefan Hajnoczi, 2012/07/20
- [Qemu-devel] [PATCH 01/16] net: Add a hub net client, Stefan Hajnoczi, 2012/07/20