[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FOR 0.12 PATCH v3 11/21] default devices: network
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [FOR 0.12 PATCH v3 11/21] default devices: network |
Date: |
Mon, 7 Dec 2009 13:42:43 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., (continued)
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Alexander Graf, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Alexander Graf, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Alexander Graf, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Gerd Hoffmann, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Alexander Graf, 2009/12/07
- [Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Gerd Hoffmann, 2009/12/08
[Qemu-devel] Re: [FOR 0.12 PATCH v3 05/21] default devices: core code & serial lines., Alexander Graf, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 11/21] default devices: network,
Gerd Hoffmann <=
[Qemu-devel] [FOR 0.12 PATCH v3 12/21] default devices: drives, Gerd Hoffmann, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 08/21] zap serial_monitor_mux, Gerd Hoffmann, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 09/21] default devices: vga adapter., Gerd Hoffmann, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 07/21] default devices: qemu monitor., Gerd Hoffmann, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 10/21] default devices: add global cmd line option., Gerd Hoffmann, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 15/21] chardev: make chardevs specified in config file work., Gerd Hoffmann, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 06/21] default devices: parallel port., Gerd Hoffmann, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH v3 13/21] qdev: make compat stuff more generic, Gerd Hoffmann, 2009/12/07