From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMNiK-0002j5-DP for qemu-devel@nongnu.org; Tue, 17 May 2011 13:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMNiJ-00037U-9u for qemu-devel@nongnu.org; Tue, 17 May 2011 13:05:44 -0400 Received: from thoth.sbs.de ([192.35.17.2]:32324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMNiJ-00037A-0w for qemu-devel@nongnu.org; Tue, 17 May 2011 13:05:43 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p4HH5fuU005163 for ; Tue, 17 May 2011 19:05:41 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4HH5fOg031246 for ; Tue, 17 May 2011 19:05:41 +0200 Message-ID: <4DD2AAE5.1020408@siemens.com> Date: Tue, 17 May 2011 19:05:41 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/2] net: Dump client type 'info network' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Include the client type name into the output of 'info network'. The result looks like this: (qemu) info network VLAN 0 devices: rtl8139.0 (NIC): model=rtl8139,macaddr=52:54:00:12:34:57 Devices not on any VLAN: virtio-net-pci.0 (NIC): model=virtio-net-pci,macaddr=52:54:00:12:34:56 \ network1 (tap): fd=5 Signed-off-by: Jan Kiszka --- net.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/net.c b/net.c index 606ce70..a4ee6b1 100644 --- a/net.c +++ b/net.c @@ -1223,6 +1223,15 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) void do_info_network(Monitor *mon) { + static const char *typename[] = { + [NET_CLIENT_TYPE_NONE] = "none", + [NET_CLIENT_TYPE_NIC] = "NIC", + [NET_CLIENT_TYPE_SLIRP] = "user IPv4", + [NET_CLIENT_TYPE_TAP] = "tap", + [NET_CLIENT_TYPE_SOCKET] = "socket", + [NET_CLIENT_TYPE_VDE] = "VDE", + [NET_CLIENT_TYPE_DUMP] = "dump", + }; VLANState *vlan; VLANClientState *vc, *peer; net_client_type type; @@ -1231,7 +1240,8 @@ void do_info_network(Monitor *mon) monitor_printf(mon, "VLAN %d devices:\n", vlan->id); QTAILQ_FOREACH(vc, &vlan->clients, next) { - monitor_printf(mon, " %s: %s\n", vc->name, vc->info_str); + monitor_printf(mon, " %s (%s): %s\n", vc->name, + typename[vc->info->type], vc->info_str); } } monitor_printf(mon, "Devices not on any VLAN:\n"); @@ -1239,10 +1249,12 @@ void do_info_network(Monitor *mon) peer = vc->peer; type = vc->info->type; if (!peer || type == NET_CLIENT_TYPE_NIC) { - monitor_printf(mon, " %s: %s\n", vc->name, vc->info_str); + monitor_printf(mon, " %s (%s): %s\n", vc->name, typename[type], + vc->info_str); } if (peer && type == NET_CLIENT_TYPE_NIC) { - monitor_printf(mon, " \\ %s: %s\n", peer->name, peer->info_str); + monitor_printf(mon, " \\ %s (%s): %s\n", peer->name, + typename[peer->info->type], peer->info_str); } } } -- 1.7.1