From patchwork Tue Nov 24 08:58:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 39190 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 118ACB7B66 for ; Tue, 24 Nov 2009 20:17:57 +1100 (EST) Received: from localhost ([127.0.0.1]:33125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCrX0-0006yj-54 for incoming@patchwork.ozlabs.org; Tue, 24 Nov 2009 04:17:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCrEo-0006z5-EI for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:59:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCrEh-0006rd-Rl for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:59:04 -0500 Received: from [199.232.76.173] (port=51452 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCrEh-0006qy-ED for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:58:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48046) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCrEg-0000tn-Os for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:58:59 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAO8wsu9009252 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 Nov 2009 03:58:55 -0500 Received: from zweiblum.home.kraxel.org (vpn1-4-89.ams2.redhat.com [10.36.4.89]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAO8wpev011992; Tue, 24 Nov 2009 03:58:52 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 51EDE12008; Tue, 24 Nov 2009 09:58:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 24 Nov 2009 09:58:43 +0100 Message-Id: <1259053124-10471-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1259053124-10471-1-git-send-email-kraxel@redhat.com> References: <1259053124-10471-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 09/10] 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 9ea66e3..9375351 100644 --- a/net.c +++ b/net.c @@ -112,6 +112,8 @@ static QTAILQ_HEAD(, VLANState) vlans; static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; +int default_net = 1; + /***********************************************************/ /* network device redirectors */ @@ -2834,7 +2836,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 @@ -2887,5 +2889,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 4ffce91..3611d10 100644 --- a/net.h +++ b/net.h @@ -133,6 +133,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 6b00c2c..960d2f6 100644 --- a/vl.c +++ b/vl.c @@ -5418,6 +5418,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: