aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-02-11 14:44:59 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-02-23 14:07:58 -0600
commitf203baee5bd06e06278ec6b98e3a649ed5d8f20e (patch)
tree6c2e263c0ade18d997d7cba77d20f05978f9c54e /net/tap-win32.c
parentnet: net_check_clients() runs too early to see -device, fix (diff)
downloadqemu-kvm-f203baee5bd06e06278ec6b98e3a649ed5d8f20e.tar.gz
qemu-kvm-f203baee5bd06e06278ec6b98e3a649ed5d8f20e.tar.bz2
qemu-kvm-f203baee5bd06e06278ec6b98e3a649ed5d8f20e.zip
net: Fix bogus "Warning: vlan 0 with no nics" with -device
net_check_clients() prints this when an VLAN has host devices, but no guest devices. It uses VLANState members nb_guest_devs and nb_host_devs to keep track of these devices. However, -device does not update nb_guest_devs, only net_init_nic() does that, for -net nic. Check the VLAN clients directly, and remove the counters. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 62112d181ca33fea976100c4335dfc3e2f727e6c)
Diffstat (limited to 'net/tap-win32.c')
-rw-r--r--net/tap-win32.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/tap-win32.c b/net/tap-win32.c
index b717c1724..8370c803b 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -714,10 +714,6 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
return -1;
}
- if (vlan) {
- vlan->nb_host_devs++;
- }
-
return 0;
}