diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-02-11 14:44:59 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-02-19 12:12:46 -0600 |
| commit | 62112d181ca33fea976100c4335dfc3e2f727e6c (patch) | |
| tree | 890c926361887653e34b4cdfc1219f5f1511a507 /net | |
| parent | 668680f75feea79704c603b96126c0833e1ed9a9 (diff) | |
| download | focaccia-qemu-62112d181ca33fea976100c4335dfc3e2f727e6c.tar.gz focaccia-qemu-62112d181ca33fea976100c4335dfc3e2f727e6c.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>
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 361899b8f2..317cca7f63 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -738,10 +738,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 5533737e4b..442a9c790c 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 b717c17243..8370c803bf 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; } diff --git a/net/tap.c b/net/tap.c index d3492de116..7a7320c1a2 100644 --- a/net/tap.c +++ b/net/tap.c @@ -449,9 +449,5 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan } } - if (vlan) { - vlan->nb_host_devs++; - } - return 0; } diff --git a/net/vde.c b/net/vde.c index 42b4633501..0b46fa6405 100644 --- a/net/vde.c +++ b/net/vde.c @@ -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; } |