[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network'
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network' |
Date: |
Fri, 20 May 2011 18:19:53 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
Include the client type name into the output of 'info network'. The
result looks like this:
(qemu) info network
VLAN 0 devices:
rtl8139.0: type=nic,model=rtl8139,macaddr=52:54:00:12:34:57
Devices not on any VLAN:
virtio-net-pci.0: type=nic,model=virtio-net-pci,macaddr=52:54:00:12:34:56
\ network1: type=tap,fd=5
Signed-off-by: Jan Kiszka <address@hidden>
---
Changes in v2:
- format type as "type=name"
- use standard type names
- factor out print_net_client
net.c | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/net.c b/net.c
index 606ce70..6d06eb7 100644
--- a/net.c
+++ b/net.c
@@ -1221,6 +1221,22 @@ int do_netdev_del(Monitor *mon, const QDict *qdict,
QObject **ret_data)
return 0;
}
+static void print_net_client(Monitor *mon, VLANClientState *vc)
+{
+ static const char *typename[] = {
+ [NET_CLIENT_TYPE_NONE] = "none",
+ [NET_CLIENT_TYPE_NIC] = "nic",
+ [NET_CLIENT_TYPE_SLIRP] = "user",
+ [NET_CLIENT_TYPE_TAP] = "tap",
+ [NET_CLIENT_TYPE_SOCKET] = "socket",
+ [NET_CLIENT_TYPE_VDE] = "vde",
+ [NET_CLIENT_TYPE_DUMP] = "dump",
+ };
+
+ monitor_printf(mon, "%s: type=%s,%s\n", vc->name,
+ typename[vc->info->type], vc->info_str);
+}
+
void do_info_network(Monitor *mon)
{
VLANState *vlan;
@@ -1231,7 +1247,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, " ");
+ print_net_client(mon, vc);
}
}
monitor_printf(mon, "Devices not on any VLAN:\n");
@@ -1239,10 +1256,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, " ");
+ print_net_client(mon, vc);
}
if (peer && type == NET_CLIENT_TYPE_NIC) {
- monitor_printf(mon, " \\ %s: %s\n", peer->name, peer->info_str);
+ monitor_printf(mon, " \\ ");
+ print_net_client(mon, peer);
}
}
}
--
1.7.1
- [Qemu-devel] [PATCH 2/2] net: Dump client type 'info network', Jan Kiszka, 2011/05/17
- Re: [Qemu-devel] [PATCH 2/2] net: Dump client type 'info network', Stefan Hajnoczi, 2011/05/18
- Re: [Qemu-devel] [PATCH 2/2] net: Dump client type 'info network', Markus Armbruster, 2011/05/18
- Re: [Qemu-devel] [PATCH 2/2] net: Dump client type 'info network', Jan Kiszka, 2011/05/20
- Re: [Qemu-devel] [PATCH 2/2] net: Dump client type 'info network', Jan Kiszka, 2011/05/20
- [Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network',
Jan Kiszka <=
- Re: [Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network', Markus Armbruster, 2011/05/23
- Re: [Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network', Jan Kiszka, 2011/05/23
- Re: [Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network', Markus Armbruster, 2011/05/23
- Re: [Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network', Jan Kiszka, 2011/05/23
- Re: [Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network', Markus Armbruster, 2011/05/23
- Re: [Qemu-devel] [PATCH v2 2/2] net: Dump client type 'info network', Jan Kiszka, 2011/05/23