From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 15 Jul 2008 16:35:57 +0000 (+0100)
Subject: Do not try to use -net user as a default when slirp disabled.
X-Git-Tag: xen-3.3.0-rc1~34^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c9439978836adb7751b7d311ecf77e3618a0e930;p=qemu-xen-3.3-testing.git

Do not try to use -net user as a default when slirp disabled.

Patch from Jeremy Fitzhardinge <jeremy@goop.org> (who is a Citrix
staff member).

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/vl.c b/vl.c
index f1d92c1c..81f7d8fb 100644
--- a/vl.c
+++ b/vl.c
@@ -8370,9 +8370,10 @@ int main(int argc, char **argv)
     /* init network clients */
     if (nb_net_clients == 0) {
         /* if no clients, we use a default config */
-        net_clients[0] = "nic";
-        net_clients[1] = "user";
-        nb_net_clients = 2;
+        net_clients[nb_net_clients++] = "nic";
+#ifdef CONFIG_SLIRP
+        net_clients[nb_net_clients++] = "user";
+#endif
     }
 
     for(i = 0;i < nb_net_clients; i++) {