From a0104e0ec7939781d79ca4b54ebedd5fd3360151 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 11 Feb 2010 14:45:01 +0100 Subject: [PATCH] net: info network shows only VLAN clients, fix Clients not associated with a VLAN exist since commit d80b9fc6. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- net.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net.c b/net.c index fb425e397f..fb89f9474c 100644 --- a/net.c +++ b/net.c @@ -1210,16 +1210,23 @@ void net_set_boot_mask(int net_boot_mask) void do_info_network(Monitor *mon) { VLANState *vlan; + VLANClientState *vc; QTAILQ_FOREACH(vlan, &vlans, next) { - VLANClientState *vc; - 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, "Devices not on any VLAN:\n"); + QTAILQ_FOREACH(vc, &non_vlan_clients, next) { + monitor_printf(mon, " %s: %s", vc->name, vc->info_str); + if (vc->peer) { + monitor_printf(mon, " peer=%s", vc->peer->name); + } + monitor_printf(mon, "\n"); + } } void do_set_link(Monitor *mon, const QDict *qdict) -- 2.11.0