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>

diff --git a/net.c b/net.c
index 13bdbb2caa0d14ad25909afc18da31aec5c83df7..6ef93e615c8db9d2de230fc1b988213d763ba4f7 100644 (file)
--- 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 @@ static int net_init_netdev(QemuOpts *opts, void *dummy)
 
 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 @@ int net_client_parse(QemuOptsList *opts_list, const char *optarg)
         return -1;
     }
 
+    default_net = 0;
     return 0;
 }

diff --git a/net.h b/net.h
index d583d590a769800537a659e4d21ecce51ab8ba77..4971fcbbb525cb0020d100e61f34d55f95d116be 100644 (file)
--- a/net.h
+++ b/net.h
@@ -139,6 +139,7 @@ struct NICInfo {
 
 extern int nb_nics;
 extern NICInfo nd_table[MAX_NICS];
+extern int default_net;
 
 /* BT HCI info */
 

diff --git a/vl.c b/vl.c
index 69b577fbba8189b2fcade884d68845117c7bfe6a..4825836266736a205465347aeb3bb47d13540f3f 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -5476,6 +5476,7 @@ int main(int argc, char **argv, char **envp)
                 default_parallel = 0;
                 default_monitor = 0;
                 default_vga = 0;
+                default_net = 0;
                 break;
 #ifndef _WIN32
             case QEMU_OPTION_chroot: