[Qemu-devel] [PATCH] Do not try to use -net user as a default when slirp disabled.

[Qemu-devel] [PATCH] Do not try to use -net user as a default when slirp disabled.

[Ian Jackson]

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

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 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vl.c b/vl.c
index f1d92c1..81f7d8f 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++) {
-- 
1.4.4.4

Re: [Qemu-devel] [PATCH] Do not try to use -net user as a default when slirp disabled.

[Anthony Liguori]

Ian Jackson wrote:
> When CONFIG_SLIRP is not defined, we should not try to use
> -net user as a default.
>
> Patch from Jeremy Fitzhardinge <jeremy@goop.org> (who is a Citrix
> staff member).
>   

Applied.  Thanks.

Regards,

Anthony Liguori