From patchwork Wed Aug 1 12:54:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 174463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B1B32C00B0 for ; Wed, 1 Aug 2012 23:59:55 +1000 (EST) Received: from localhost ([::1]:53776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwYTd-00020E-9n for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 08:56:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwYSJ-0007Eu-8Y for qemu-devel@nongnu.org; Wed, 01 Aug 2012 08:55:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwYSE-0007ne-UC for qemu-devel@nongnu.org; Wed, 01 Aug 2012 08:55:15 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:43253) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwYSE-0007nN-KO for qemu-devel@nongnu.org; Wed, 01 Aug 2012 08:55:10 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 Aug 2012 13:55:09 +0100 Received: from d06nrmr1307.portsmouth.uk.ibm.com (9.149.38.129) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 1 Aug 2012 13:55:07 +0100 Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q71Ct6pB2384096 for ; Wed, 1 Aug 2012 13:55:06 +0100 Received: from d06av12.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q71Ct6RN014513 for ; Wed, 1 Aug 2012 06:55:06 -0600 Received: from localhost (sig-9-146-165-117.uk.ibm.com [9.146.165.117]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q71Ct6Ol014454; Wed, 1 Aug 2012 06:55:06 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Wed, 1 Aug 2012 13:54:46 +0100 Message-Id: <1343825691-343-15-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343825691-343-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1343825691-343-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12080112-8372-0000-0000-0000035A22B5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.108 Cc: Zhi Yong Wu , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable info 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 From: Zhi Yong Wu Reviewed-by: Jan Kiszka Signed-off-by: Zhi Yong Wu Signed-off-by: Stefan Hajnoczi Reviewed-by: Laszlo Ersek --- net.c | 15 ++++++++++----- net.h | 1 + net/hub.c | 6 ++++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/net.c b/net.c index 88ccb2e..7edb52b 100644 --- a/net.c +++ b/net.c @@ -855,7 +855,7 @@ void qmp_netdev_del(const char *id, Error **errp) qemu_opts_del(qemu_opts_find(qemu_find_opts_err("netdev", errp), id)); } -static void print_net_client(Monitor *mon, NetClientState *nc) +void print_net_client(Monitor *mon, NetClientState *nc) { monitor_printf(mon, "%s: type=%s,%s\n", nc->name, NetClientOptionsKind_lookup[nc->info->type], nc->info_str); @@ -866,20 +866,25 @@ void do_info_network(Monitor *mon) NetClientState *nc, *peer; NetClientOptionsKind type; - monitor_printf(mon, "Devices not on any VLAN:\n"); + net_hub_info(mon); + QTAILQ_FOREACH(nc, &net_clients, next) { peer = nc->peer; type = nc->info->type; + + /* Skip if already printed in hub info */ + if (net_hub_id_for_client(nc, NULL) == 0) { + continue; + } + if (!peer || type == NET_CLIENT_OPTIONS_KIND_NIC) { - monitor_printf(mon, " "); print_net_client(mon, nc); } /* else it's a netdev connected to a NIC, printed with the NIC */ if (peer && type == NET_CLIENT_OPTIONS_KIND_NIC) { - monitor_printf(mon, " \\ "); + monitor_printf(mon, " \\ "); print_net_client(mon, peer); } } - net_hub_info(mon); } void qmp_set_link(const char *name, bool up, Error **errp) diff --git a/net.h b/net.h index 7e629d3..adeef0c 100644 --- a/net.h +++ b/net.h @@ -100,6 +100,7 @@ void qemu_check_nic_model(NICInfo *nd, const char *model); int qemu_find_nic_model(NICInfo *nd, const char * const *models, const char *default_model); +void print_net_client(Monitor *mon, NetClientState *nc); void do_info_network(Monitor *mon); /* NIC info */ diff --git a/net/hub.c b/net/hub.c index 900fa4e..522fe99 100644 --- a/net/hub.c +++ b/net/hub.c @@ -223,8 +223,10 @@ void net_hub_info(Monitor *mon) QLIST_FOREACH(hub, &hubs, next) { monitor_printf(mon, "hub %d\n", hub->id); QLIST_FOREACH(port, &hub->ports, next) { - monitor_printf(mon, " port %d peer %s\n", port->id, - port->nc.peer ? port->nc.peer->name : ""); + if (port->nc.peer) { + monitor_printf(mon, " \\ "); + print_net_client(mon, port->nc.peer); + } } } }