From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QU2Ni-0005gA-Nz for qemu-devel@nongnu.org; Tue, 07 Jun 2011 15:56:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QU2Ng-0005fO-D6 for qemu-devel@nongnu.org; Tue, 07 Jun 2011 15:56:06 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:61721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QU2Nf-0005fF-RD for qemu-devel@nongnu.org; Tue, 07 Jun 2011 15:56:04 -0400 Received: by pwi6 with SMTP id 6so49783pwi.4 for ; Tue, 07 Jun 2011 12:56:02 -0700 (PDT) Message-ID: <4DEE824E.7080209@codemonkey.ws> Date: Tue, 07 Jun 2011 14:55:58 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <893bbf06226ec15c6e1bcc99e3e3263dfaf89332.1307465139.git.jan.kiszka@siemens.com> In-Reply-To: <893bbf06226ec15c6e1bcc99e3e3263dfaf89332.1307465139.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 6/9] net: Improve layout of 'info network' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: "libvir-list@redhat.com" , qemu-devel@nongnu.org, Markus Armbruster On 06/07/2011 11:45 AM, Jan Kiszka wrote: > 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 > Signed-off-by: Jan Kiszka There isn't a query-network yet in QMP so libvirt is probably still using the HMP version. Can someone on the libvirt side Ack/Nack about whether this patch will break libvirt? Regards, Anthony Liguori > --- > 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"); > } > } >