diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-07-20 12:20:19 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-23 10:19:50 -0500 |
| commit | 19061e63c04810cb24769e9d92d943079206297a (patch) | |
| tree | 7ff92737e601312fd6fd9f58d0f94f09689a6224 /net.c | |
| parent | e6d43cfb1f937898dc031c7b38a23e5ccad8bd9a (diff) | |
| download | focaccia-qemu-19061e63c04810cb24769e9d92d943079206297a.tar.gz focaccia-qemu-19061e63c04810cb24769e9d92d943079206297a.zip | |
net: Improve layout of 'info network'
Improve the layout when listing non-vlan clients via 'info network'. The result looks like this: (qemu) info network Devices not on any VLAN: orphan: net=10.0.2.0, restricted=n virtio-net-pci.0: model=virtio-net-pci,macaddr=52:54:00:12:34:56 \ network2: fd=5 e1000.0: model=e1000,macaddr=52:54:00:12:34:57 \ network1: net=10.0.2.0, restricted=n rtl8139.0: model=rtl8139,macaddr=52:54:00:12:34:58 ie. peers are grouped, orphans are listed as before. CC: Markus Armbruster <armbru@redhat.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net.c')
| -rw-r--r-- | net.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/net.c b/net.c index 66123ad409..43627ad8c8 100644 --- a/net.c +++ b/net.c @@ -1224,7 +1224,8 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) void do_info_network(Monitor *mon) { VLANState *vlan; - VLANClientState *vc; + VLANClientState *vc, *peer; + net_client_type type; QTAILQ_FOREACH(vlan, &vlans, next) { monitor_printf(mon, "VLAN %d devices:\n", vlan->id); @@ -1235,11 +1236,14 @@ void do_info_network(Monitor *mon) } monitor_printf(mon, "Devices not on any VLAN:\n"); QTAILQ_FOREACH(vc, &non_vlan_clients, next) { - monitor_printf(mon, " %s: %s", vc->name, vc->info_str); - if (vc->peer) { - monitor_printf(mon, " peer=%s", vc->peer->name); + peer = vc->peer; + type = vc->info->type; + if (!peer || type == NET_CLIENT_TYPE_NIC) { + monitor_printf(mon, " %s: %s\n", vc->name, vc->info_str); + } /* else it's a netdev connected to a NIC, printed with the NIC */ + if (peer && type == NET_CLIENT_TYPE_NIC) { + monitor_printf(mon, " \\ %s: %s\n", peer->name, peer->info_str); } - monitor_printf(mon, "\n"); } } |