summaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-02-11 14:45:01 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-02-19 12:12:47 -0600
commita0104e0ec7939781d79ca4b54ebedd5fd3360151 (patch)
treed36f27cc4d39cf9ab2c66223d18dcd0628ab2e23 /net.c
parentefe32fdde15e5764cfbc68cb2d61737681b1e096 (diff)
net: info network shows only VLAN clients, fix
Clients not associated with a VLAN exist since commit d80b9fc6. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c11
1 files 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)