Patchwork [5/6] net: info network shows only VLAN clients, fix

login
register
mail settings
Submitter Markus Armbruster
Date Feb. 11, 2010, 1:45 p.m.
Message ID <1265895902-15664-6-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/45126/
State New
Headers show

Comments

Markus Armbruster - Feb. 11, 2010, 1:45 p.m.
Clients not associated with a VLAN exist since commit d80b9fc6.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 net.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Patch

diff --git a/net.c b/net.c
index fb425e3..fb89f94 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)