From patchwork Thu May 24 17:59:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 161191 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 357CDB6F77 for ; Fri, 25 May 2012 04:45:31 +1000 (EST) Received: from localhost ([::1]:39637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcN6-0008WA-Ue for incoming@patchwork.ozlabs.org; Thu, 24 May 2012 14:02:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcMo-0008L4-Jl for qemu-devel@nongnu.org; Thu, 24 May 2012 14:02:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXcMj-0003cR-P3 for qemu-devel@nongnu.org; Thu, 24 May 2012 14:02:30 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:45774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcMj-0003bY-KO for qemu-devel@nongnu.org; Thu, 24 May 2012 14:02:25 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 24 May 2012 14:02:23 -0400 Received: from d01dlp02.pok.ibm.com (9.56.224.85) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 24 May 2012 14:02:20 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 933316E8057 for ; Thu, 24 May 2012 14:02:19 -0400 (EDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q4OI2HdL120768 for ; Thu, 24 May 2012 14:02:18 -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 q4OI1hJO031428 for ; Thu, 24 May 2012 12:01:43 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q4OI1dNl030943; Thu, 24 May 2012 12:01:40 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Fri, 25 May 2012 02:01:31 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 01:59:19 +0800 Message-Id: <1337882362-20100-14-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> References: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12052418-7182-0000-0000-000001991D26 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.139 Cc: pbonzini@redhat.com, wuzhy@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH v3 13/16] net: Make the monitor output more reasonable hub 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 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 : ""); } }