[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 6/9] net: Improve layout of 'info network'
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 6/9] net: Improve layout of 'info network' |
Date: |
Wed, 08 Jun 2011 09:14:27 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) |
Jan Kiszka <address@hidden> 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.
>
> CC: Markus Armbruster <address@hidden>
> Signed-off-by: Jan Kiszka <address@hidden>
> ---
> 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);
> + }
I still think we could use a comment here, like
} /* else it's a netdev connected to a NIC, printed with the NIC */
See http://lists.gnu.org/archive/html/qemu-devel/2011-05/msg01603.html
> + if (peer && type == NET_CLIENT_TYPE_NIC) {
> + monitor_printf(mon, " \\ %s: %s\n", peer->name,
> peer->info_str);
> }
> - monitor_printf(mon, "\n");
> }
> }
- [Qemu-devel] [PATCH 0/9] Various net and slirp fixes & enhancements, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 2/9] slirp: Canonicalize restrict syntax, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 4/9] slirp: Replace m_freem with m_free, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 8/9] net: Dump client type 'info network', Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 5/9] slirp: Put forked exec into separate process group, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 9/9] net: Consistently use qemu_macaddr_default_if_unset, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 3/9] slirp: Strictly associate DHCP/BOOTP and TFTP with virtual host, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 7/9] net: Refactor net_client_types, Jan Kiszka, 2011/06/07