Message ID | 4DD2AAE3.4070907@siemens.com |
---|---|
State | New |
Headers | show |
Jan Kiszka <jan.kiszka@siemens.com> writes: > 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. Cute :) > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > net.c | 14 +++++++++----- > 1 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/net.c b/net.c > index 4f777c3..606ce70 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); > + } > + if (peer && type == NET_CLIENT_TYPE_NIC) { > + monitor_printf(mon, " \\ %s: %s\n", peer->name, peer->info_str); > } > - monitor_printf(mon, "\n"); > } > } Before: print all members of non_vlan_clients. Show any peering with "peer=ID". After: 1. print any NIC and any non-NIC without a peer (first if) 2. print NIC's peer, if any (second if) 1+2 together cover all members. Okay. But not obvious to me. Care to explain n a comment? Perhaps something like: 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); }
diff --git a/net.c b/net.c index 4f777c3..606ce70 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); + } + if (peer && type == NET_CLIENT_TYPE_NIC) { + monitor_printf(mon, " \\ %s: %s\n", peer->name, peer->info_str); } - monitor_printf(mon, "\n"); } }
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. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- net.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)