From patchwork Tue Nov 17 09:38:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 38602 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 36577B7B66 for ; Tue, 17 Nov 2009 20:49:57 +1100 (EST) Received: from localhost ([127.0.0.1]:49615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAKh7-0005dz-Ax for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 04:49:53 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAKWE-00028j-AP for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:38 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAKW8-00025V-F2 for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:36 -0500 Received: from [199.232.76.173] (port=51754 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAKW8-00025J-7y for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22098) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAKW7-0007Cm-MX for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:31 -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 nAH9cUE6017340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 04:38:30 -0500 Received: from zweiblum.home.kraxel.org (vpn1-7-195.ams2.redhat.com [10.36.7.195]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAH9cSIi021612; Tue, 17 Nov 2009 04:38:29 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id B91757003F; Tue, 17 Nov 2009 10:38:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 10:38:17 +0100 Message-Id: <1258450699-24445-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1258450699-24445-1-git-send-email-kraxel@redhat.com> References: <1258450699-24445-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 7/9] default devices: net 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 Switch over network to the new defaults system. Signed-off-by: Gerd Hoffmann --- net.c | 5 ++++- net.h | 1 + 2 files changed, 5 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 */