diff options
author | Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> | 2012-07-24 16:35:16 +0100 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-08-01 13:32:11 +0100 |
commit | 1a8595931ac6ffb76c2e10675ba3a39e807f02fd (patch) | |
tree | b8932738c6433e19d394612e1857689f40d21a50 | |
parent | b20c6b9e47772b9162ed194e7b2884afa6a354ab (diff) | |
download | qemu-1a8595931ac6ffb76c2e10675ba3a39e807f02fd.zip qemu-1a8595931ac6ffb76c2e10675ba3a39e807f02fd.tar.gz qemu-1a8595931ac6ffb76c2e10675ba3a39e807f02fd.tar.bz2 |
net: Make "info network" output more readable info
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-rw-r--r-- | net.c | 15 | ||||
-rw-r--r-- | net.h | 1 | ||||
-rw-r--r-- | net/hub.c | 6 |
3 files changed, 15 insertions, 7 deletions
@@ -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) @@ -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 */ @@ -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); + } } } } |