[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable info |
Date: |
Wed, 1 Aug 2012 13:54: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>
Reviewed-by: Laszlo Ersek <address@hidden>
---
net.c | 15 ++++++++++-----
net.h | 1 +
net/hub.c | 6 ++++--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/net.c b/net.c
index 88ccb2e..7edb52b 100644
--- a/net.c
+++ b/net.c
@@ -855,7 +855,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);
@@ -866,20 +866,25 @@ 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;
+
+ /* Skip if already printed in hub info */
+ if (net_hub_id_for_client(nc, NULL) == 0) {
+ 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..adeef0c 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 *nc);
void do_info_network(Monitor *mon);
/* NIC info */
diff --git a/net/hub.c b/net/hub.c
index 900fa4e..522fe99 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -223,8 +223,10 @@ void net_hub_info(Monitor *mon)
QLIST_FOREACH(hub, &hubs, next) {
monitor_printf(mon, "hub %d\n", hub->id);
QLIST_FOREACH(port, &hub->ports, next) {
- monitor_printf(mon, " port %d peer %s\n", port->id,
- port->nc.peer ? port->nc.peer->name : "<none>");
+ if (port->nc.peer) {
+ monitor_printf(mon, " \\ ");
+ print_net_client(mon, port->nc.peer);
+ }
}
}
}
--
1.7.10.4
- [Qemu-devel] [PULL 00/19] Net patches for QEMU 1.2, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 03/19] net: Use hubs for the vlan feature, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 06/19] net: Drop vlan argument to qemu_new_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 17/19] hub: add the support for hub own flow control, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 05/19] hub: Check that hubs are configured correctly, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 07/19] net: Convert qdev_prop_vlan to peer with hub, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 10/19] net: Rename non_vlan_clients to net_clients, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 01/19] net: Add interface to bridge when SIOCBRADDIF isn't available, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable info,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before net queue deliver packets, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 19/19] net: add the support for -netdev socket, listen, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 18/19] net: fix the coding style, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 08/19] net: Remove vlan code from net.c, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 12/19] net: Rename vc local variables to nc, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 13/19] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 11/19] net: Rename VLANClientState to NetClientState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 09/19] net: Remove VLANState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 04/19] net: Look up 'vlan' net clients using hubs, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 02/19] net: Add a hub net client, Stefan Hajnoczi, 2012/08/01