From patchwork Tue Dec 8 12:11:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 40627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B169CB7B6C for ; Tue, 8 Dec 2009 23:59:24 +1100 (EST) Received: from localhost ([127.0.0.1]:38629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHzez-0006cA-Qh for incoming@patchwork.ozlabs.org; Tue, 08 Dec 2009 07:59:21 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHyvW-0005mP-9W for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHyvQ-0005iT-Il for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:20 -0500 Received: from [199.232.76.173] (port=44204 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHyvO-0005hg-QB for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45635) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHyvO-00083n-BR for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:14 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB8CCDlB019038 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 8 Dec 2009 07:12:13 -0500 Received: from zweiblum.home.kraxel.org (vpn2-9-91.ams2.redhat.com [10.36.9.91]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB8CC2Y0004283; Tue, 8 Dec 2009 07:12:12 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 2D6EC70116; Tue, 8 Dec 2009 13:11:58 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 8 Dec 2009 13:11:47 +0100 Message-Id: <1260274314-2906-16-git-send-email-kraxel@redhat.com> In-Reply-To: <1260274314-2906-1-git-send-email-kraxel@redhat.com> References: <1260274314-2906-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann , agraf@suse.de, lcapitulino@redhat.com Subject: [Qemu-devel] [FOR 0.12 PATCH v4 15/22] default devices: network X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 69b577f..4825836 100644 --- 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: