[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 8/9] net: Dump client type 'info network'
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 8/9] net: Dump client type 'info network' |
Date: |
Wed, 08 Jun 2011 10:21:18 +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
CC: Markus Armbruster <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
---
v2: Rebased over changes to 6/9
net.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/net.c b/net.c
index bd015b1..fc6c093 100644
--- a/net.c
+++ b/net.c
@@ -1227,6 +1227,12 @@ int do_netdev_del(Monitor *mon, const QDict *qdict,
QObject **ret_data)
return 0;
}
+static void print_net_client(Monitor *mon, VLANClientState *vc)
+{
+ monitor_printf(mon, "%s: type=%s,%s\n", vc->name,
+ net_client_types[vc->info->type].type, vc->info_str);
+}
+
void do_info_network(Monitor *mon)
{
VLANState *vlan;
@@ -1237,7 +1243,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");
@@ -1245,10 +1252,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);
} /* else it's a netdev connected to a NIC, printed with the NIC */
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);
}
}
}
- [Qemu-devel] [PATCH 1/9] slirp: Fix restricted mode, (continued)
- [Qemu-devel] [PATCH 2/9] slirp: Canonicalize restrict syntax, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 4/9] slirp: Replace m_freem with m_free, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 8/9] net: Dump client type 'info network', Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH v2 8/9] net: Dump client type 'info network',
Jan Kiszka <=
- [Qemu-devel] [PATCH 5/9] slirp: Put forked exec into separate process group, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 9/9] net: Consistently use qemu_macaddr_default_if_unset, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 3/9] slirp: Strictly associate DHCP/BOOTP and TFTP with virtual host, Jan Kiszka, 2011/06/07
- [Qemu-devel] [PATCH 7/9] net: Refactor net_client_types, Jan Kiszka, 2011/06/07
- Re: [Qemu-devel] [PATCH 0/9] Various net and slirp fixes & enhancements, Markus Armbruster, 2011/06/08