From patchwork Fri Jul 20 12:01: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: 172238 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 1C3122C03AA for ; Fri, 20 Jul 2012 22:39:56 +1000 (EST) Received: from localhost ([::1]:57053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBvO-0005zq-Th for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 08:03:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBua-0004JT-7M for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsBuN-0003Vp-WF for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:24 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:56248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBuN-0003VB-Ld for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:11 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Jul 2012 13:02:10 +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; Fri, 20 Jul 2012 13:02:09 +0100 Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6KC28Au2121954 for ; Fri, 20 Jul 2012 13:02:08 +0100 Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6KC27u0004113 for ; Fri, 20 Jul 2012 06:02:08 -0600 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6KC27P9004103; Fri, 20 Jul 2012 06:02:07 -0600 From: Stefan Hajnoczi To: Date: Fri, 20 Jul 2012 13:01:46 +0100 Message-Id: <1342785709-3152-14-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342785709-3152-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1342785709-3152-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072012-8372-0000-0000-0000033E9A1A X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.108 Cc: Paolo Bonzini , Zhi Yong Wu , lersek@redhat.com, Stefan Hajnoczi , Zhi Yong Wu Subject: [Qemu-devel] [PATCH 13/16] 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 --- net.c | 14 +++++++++----- net.h | 1 + net/hub.c | 23 +++++++++++++++++++++-- net/hub.h | 1 + 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/net.c b/net.c index cdc6cc7..2eca563 100644 --- a/net.c +++ b/net.c @@ -856,7 +856,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); @@ -867,20 +867,24 @@ 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; + + if (net_hub_port_peer_nc(nc)) { + 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..c819de4 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 *vc); void do_info_network(Monitor *mon); /* NIC info */ diff --git a/net/hub.c b/net/hub.c index 1e88fb2..f697a78 100644 --- a/net/hub.c +++ b/net/hub.c @@ -214,6 +214,25 @@ NetClientState *net_hub_port_find(unsigned int hub_id) } /** + * Determine if one nc peers with one hub port + */ +bool net_hub_port_peer_nc(NetClientState *nc) +{ + NetHub *hub; + NetHubPort *port; + + QLIST_FOREACH(hub, &hubs, next) { + QLIST_FOREACH(port, &hub->ports, next) { + if (nc == port->nc.peer) { + return true; + } + } + } + + return false; +} + +/** * Print hub configuration */ void net_hub_info(Monitor *mon) @@ -224,8 +243,8 @@ void net_hub_info(Monitor *mon) QLIST_FOREACH(hub, &hubs, next) { monitor_printf(mon, "hub %u\n", hub->id); QLIST_FOREACH(port, &hub->ports, next) { - monitor_printf(mon, " port %u peer %s\n", port->id, - port->nc.peer ? port->nc.peer->name : ""); + monitor_printf(mon, " \\ "); + print_net_client(mon, port->nc.peer); } } } diff --git a/net/hub.h b/net/hub.h index d47dc96..83af09b 100644 --- a/net/hub.h +++ b/net/hub.h @@ -26,5 +26,6 @@ void net_hub_info(Monitor *mon); int net_hub_id_for_client(NetClientState *nc, unsigned int *id); void net_hub_check_clients(void); NetClientState *net_hub_port_find(unsigned int hub_id); +bool net_hub_port_peer_nc(NetClientState *nc); #endif /* NET_HUB_H */