diff options
author | 2010-02-11 14:44:59 +0100 | |
---|---|---|
committer | 2010-02-23 14:07:58 -0600 | |
commit | f203baee5bd06e06278ec6b98e3a649ed5d8f20e (patch) | |
tree | 6c2e263c0ade18d997d7cba77d20f05978f9c54e /net | |
parent | net: net_check_clients() runs too early to see -device, fix (diff) | |
download | qemu-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')
-rw-r--r-- | net/slirp.c | 4 | ||||
-rw-r--r-- | net/socket.c | 4 | ||||
-rw-r--r-- | net/tap-win32.c | 4 | ||||
-rw-r--r-- | net/tap.c | 4 | ||||
-rw-r--r-- | net/vde.c | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/net/slirp.c b/net/slirp.c index 3f91c4bb3..50ac0b9bb 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -728,10 +728,6 @@ int net_init_slirp(QemuOpts *opts, qemu_free(config); } - if (ret != -1 && vlan) { - vlan->nb_host_devs++; - } - qemu_free(vnet); return ret; diff --git a/net/socket.c b/net/socket.c index 5533737e4..442a9c790 100644 --- a/net/socket.c +++ b/net/socket.c @@ -569,9 +569,5 @@ int net_init_socket(QemuOpts *opts, return -1; } - if (vlan) { - vlan->nb_host_devs++; - } - return 0; } 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; } @@ -441,9 +441,5 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan } } - if (vlan) { - vlan->nb_host_devs++; - } - return 0; } @@ -127,9 +127,5 @@ int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan return -1; } - if (vlan) { - vlan->nb_host_devs++; - } - return 0; } |