From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHcwq-0005N9-U3 for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:17 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHcwk-0005Ik-Lh for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:14 -0500 Received: from [199.232.76.173] (port=58679 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHcwj-0005I9-RX for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54248) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHcwi-0000gR-SJ for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:09 -0500 From: Gerd Hoffmann Date: Mon, 7 Dec 2009 13:42:43 +0100 Message-Id: <1260189773-20728-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1260189773-20728-1-git-send-email-kraxel@redhat.com> References: <1260189773-20728-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [FOR 0.12 PATCH v3 11/21] default devices: network List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , agraf@suse.de, lcapitulino@redhat.com 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 --- net.c | 5 ++++- net.h | 1 + vl.c | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) 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 @@ 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 d583d59..4971fcb 100644 --- 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 f02b333..f30da12 100644 --- a/vl.c +++ b/vl.c @@ -5465,6 +5465,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: -- 1.6.5.2