commit cb4522ccf67ba84d246291d9f75bd7f3df137d1a
author Gerd Hoffmann <kraxel@redhat.com> Tue Dec 08 13:11:47 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Sat Dec 12 07:59:43 2009 -0600
tree 0f75897827368623ca718d7af904f56978f82566
parent d8c208dd8a038d24ba4890156101bc679a8c8fef

default devices: network

Add a default_net variable which specified whenever a default network
should be created.  It is cleared in case any -net option is specified
and it is also added to the new -nodefaults switch.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

net.c

diff --git a/net.c b/net.c
index 13bdbb2..6ef93e6 100644
--- a/net.c
+++ b/net.c
@@ -39,6 +39,8 @@
 static QTAILQ_HEAD(, VLANState) vlans;
 static QTAILQ_HEAD(, VLANClientState) non_vlan_clients;
 
+int default_net = 1;
+
 /***********************************************************/
 /* network device redirectors */
 
@@ -1317,7 +1319,7 @@
 
 int net_init_clients(void)
 {
-    if (QTAILQ_EMPTY(&qemu_net_opts.head)) {
+    if (default_net) {
         /* if no clients, we use a default config */
         qemu_opts_set(&qemu_net_opts, NULL, "type", "nic");
 #ifdef CONFIG_SLIRP
@@ -1353,5 +1355,6 @@
         return -1;
     }
 
+    default_net = 0;
     return 0;
 }