From mboxrd@z Thu Jan 1 00:00:00 1970 From: zwu.kernel@gmail.com Subject: [PATCH v3 13/16] net: Make the monitor output more reasonable hub info Date: Fri, 25 May 2012 01:59:19 +0800 Message-ID: <1337882362-20100-14-git-send-email-zwu.kernel@gmail.com> References: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> Cc: kvm@vger.kernel.org, pbonzini@redhat.com, stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com, wuzhy@linux.vnet.ibm.com To: qemu-devel@nongnu.org Return-path: Received: from e8.ny.us.ibm.com ([32.97.182.138]:37649 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933532Ab2EXSCX (ORCPT ); Thu, 24 May 2012 14:02:23 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 24 May 2012 14:02:22 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 620A638C806C for ; Thu, 24 May 2012 14:02:18 -0400 (EDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q4OI2GWK062986 for ; Thu, 24 May 2012 14:02:17 -0400 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q4OI1hJU031428 for ; Thu, 24 May 2012 12:01:44 -0600 In-Reply-To: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- net.c | 7 ++++++- net/hub.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/net.c b/net.c index 61dc28d..79ac51f 100644 --- a/net.c +++ b/net.c @@ -887,6 +887,12 @@ static const struct { }, }, #endif /* CONFIG_NET_BRIDGE */ + [NET_CLIENT_TYPE_HUB] = { + .type = "hubport", + .desc = { + { /* end of list */ } + }, + }, }; int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev) @@ -1079,7 +1085,6 @@ void do_info_network(Monitor *mon) NetClientState *nc, *peer; net_client_type type; - monitor_printf(mon, "Devices not on any VLAN:\n"); QTAILQ_FOREACH(nc, &net_clients, next) { peer = nc->peer; type = nc->info->type; diff --git a/net/hub.c b/net/hub.c index 0cc385e..8a583ab 100644 --- a/net/hub.c +++ b/net/hub.c @@ -193,7 +193,7 @@ 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, + monitor_printf(mon, " \\ %s\n", port->nc.peer ? port->nc.peer->name : ""); } } -- 1.7.6