From patchwork Wed Jun 8 08:21:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 99372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 69329B6FEA for ; Wed, 8 Jun 2011 18:35:14 +1000 (EST) Received: from localhost ([::1]:58292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUEEJ-0001KR-3T for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 04:35:11 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUE0r-0007F3-An for qemu-devel@nongnu.org; Wed, 08 Jun 2011 04:21:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUE0l-00071V-9o for qemu-devel@nongnu.org; Wed, 08 Jun 2011 04:21:17 -0400 Received: from thoth.sbs.de ([192.35.17.2]:19166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUE0k-00071E-KA for qemu-devel@nongnu.org; Wed, 08 Jun 2011 04:21:10 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p588L7ZT018614; Wed, 8 Jun 2011 10:21:07 +0200 Received: from mchn199C.mchp.siemens.de ([146.254.217.116]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p588L6Xu004507; Wed, 8 Jun 2011 10:21:06 +0200 Message-ID: <4DEF30F2.7090204@siemens.com> Date: Wed, 08 Jun 2011 10:21:06 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: "qemu-devel@nongnu.org" References: <893bbf06226ec15c6e1bcc99e3e3263dfaf89332.1307465139.git.jan.kiszka@siemens.com> In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: Markus Armbruster Subject: [Qemu-devel] [PATCH v2 6/9] net: Improve layout of 'info network' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- v2: added comment as suggested by Markus net.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/net.c b/net.c index 4f777c3..425498d 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"); } }