]> git.proxmox.com Git - qemu.git/commitdiff
net: Don't warn about the default network setup
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 20 May 2011 15:50:00 +0000 (16:50 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:18:38 +0000 (07:18 -0500)
Don't warn about the default network setup that you get if no command line
-net options are specified.  There are two cases that we would otherwise
complain about:

(1) board doesn't support a NIC but the implicit "-net nic" requested one
(2) CONFIG_SLIRP not set, so the implicit "-net nic" sets up a nic that
isn't connected to anything

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
net.c

diff --git a/net.c b/net.c
index 1b521a95c2361197eeed2b1ba5df7d75c7ee6cdc..68c28406211afa98244ddd6524988131b386a528 100644 (file)
--- a/net.c
+++ b/net.c
@@ -1305,6 +1305,18 @@ void net_check_clients(void)
     VLANState *vlan;
     VLANClientState *vc;
 
+    /* Don't warn about the default network setup that you get if
+     * no command line -net or -netdev options are specified. There
+     * are two cases that we would otherwise complain about:
+     * (1) board doesn't support a NIC but the implicit "-net nic"
+     * requested one
+     * (2) CONFIG_SLIRP not set, in which case the implicit "-net nic"
+     * sets up a nic that isn't connected to anything.
+     */
+    if (default_net) {
+        return;
+    }
+
     QTAILQ_FOREACH(vlan, &vlans, next) {
         int has_nic = 0, has_host_dev = 0;