[Qemu-devel] [5092] Do not try to use -net user as a default when slirp disabled ( Jeremy Fitzhardinge)

[Anthony Liguori]

Revision: 5092
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5092
Author:   aliguori
Date:     2008-08-28 20:05:14 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------
Do not try to use -net user as a default when slirp disabled (Jeremy 
Fitzhardinge)

When CONFIG_SLIRP is not defined, we should not try to use
-net user as a default.

Patch from Jeremy Fitzhardinge <address@hidden> (who is a Citrix
staff member).

Signed-off-by: Ian Jackson <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2008-08-27 19:19:44 UTC (rev 5091)
+++ trunk/vl.c  2008-08-28 20:05:14 UTC (rev 5092)
@@ -8978,9 +8978,10 @@
     /* 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++) {