From f441b28b8d10c18d9ca751c3bed2d80b7d607019 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 28 Aug 2008 20:05:14 +0000 Subject: [PATCH] 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 (who is a Citrix staff member). Signed-off-by: Ian Jackson Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5092 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 245177a52c..8dc07082b5 100644 --- a/vl.c +++ b/vl.c @@ -8978,9 +8978,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++) { -- 2.39.2