From patchwork Tue Nov 17 09:38:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [7/9] default devices: net Date: Mon, 16 Nov 2009 23:38:17 -0000 From: Gerd Hoffmann X-Patchwork-Id: 38602 Message-Id: <1258450699-24445-8-git-send-email-kraxel@redhat.com> To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 */