]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/commitdiff
Do not try to use -net user as a default when slirp disabled.
authorIan Jackson <iwj@mariner.uk.xensource.com>
Tue, 15 Jul 2008 16:35:57 +0000 (17:35 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 15 Jul 2008 16:35:57 +0000 (17:35 +0100)
Patch from Jeremy Fitzhardinge <jeremy@goop.org> (who is a Citrix
staff member).

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

diff --git a/vl.c b/vl.c
index f1d92c1c38835e8feac026008354e7fce3ecda38..81f7d8fbb87ec93b169dc0fb5d1f444b1a29cde7 100644 (file)
--- 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++) {