From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXvA2-0003rT-RC for qemu-devel@nongnu.org; Fri, 25 May 2012 10:06:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXv9w-0007Ct-D7 for qemu-devel@nongnu.org; Fri, 25 May 2012 10:06:34 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:40313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXv9w-0007Cj-8b for qemu-devel@nongnu.org; Fri, 25 May 2012 10:06:28 -0400 Received: from /spool/local by e2.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 25 May 2012 10:06:26 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id EDC866E8057 for ; Fri, 25 May 2012 10:06:22 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q4PE5xF8120668 for ; Fri, 25 May 2012 10:06:22 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q4PE2VMh002329 for ; Fri, 25 May 2012 11:02:32 -0300 From: zwu.kernel@gmail.com Date: Fri, 25 May 2012 22:02:09 +0800 Message-Id: <1337954529-9099-1-git-send-email-zwu.kernel@gmail.com> Subject: [Qemu-devel] [PATCH v4 13/16] net: Make "info network" output more readable info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, wuzhy@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, jan.kiszka@siemens.com From: Zhi Yong Wu Reviewed-by: Jan Kiszka Signed-off-by: Zhi Yong Wu --- net.c | 18 ++++++++++++++---- net.h | 12 ++++++++++++ net/hub.c | 23 +++++++++++++++++++++-- net/hub.h | 1 + 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/net.c b/net.c index 61dc28d..ae0deec 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) @@ -1068,7 +1074,7 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } -static void print_net_client(Monitor *mon, NetClientState *vc) +void print_net_client(Monitor *mon, NetClientState *vc) { monitor_printf(mon, "%s: type=%s,%s\n", vc->name, net_client_types[vc->info->type].type, vc->info_str); @@ -1079,12 +1085,17 @@ void do_info_network(Monitor *mon) NetClientState *nc, *peer; net_client_type 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_TYPE_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_TYPE_NIC) { @@ -1092,7 +1103,6 @@ void do_info_network(Monitor *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 250669a..08306a4 100644 --- a/net.h +++ b/net.h @@ -112,6 +112,18 @@ 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); +ssize_t qemu_deliver_packet(NetClientState *sender, + unsigned flags, + const uint8_t *data, + size_t size, + void *opaque); +ssize_t qemu_deliver_packet_iov(NetClientState *sender, + unsigned flags, + const struct iovec *iov, + int iovcnt, + void *opaque); + +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 122de69..8c77d03 100644 --- a/net/hub.c +++ b/net/hub.c @@ -184,6 +184,25 @@ NetClientState *net_hub_find_client_by_name(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) @@ -194,8 +213,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 ff5024a..550189b 100644 --- a/net/hub.h +++ b/net/hub.h @@ -23,5 +23,6 @@ NetClientState *net_hub_find_client_by_name(unsigned int hub_id, void net_hub_info(Monitor *mon); int net_hub_id_for_client(NetClientState *nc, unsigned int *id); void net_hub_check_clients(void); +bool net_hub_port_peer_nc(NetClientState *nc); #endif /* NET_HUB_H */ -- 1.7.6