[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] default devices: net
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 7/9] default devices: net |
Date: |
Tue, 17 Nov 2009 10:38:17 +0100 |
Switch over network to the new defaults system.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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 */
--
1.6.2.5
- Re: [Qemu-devel] [PATCH 1/9] chardev: add greeting, (continued)
- Re: [Qemu-devel] [PATCH 1/9] chardev: add greeting, Gerd Hoffmann, 2009/11/23
- Re: [Qemu-devel] [PATCH 1/9] chardev: add greeting, Paul Brook, 2009/11/23
- Re: [Qemu-devel] [PATCH 1/9] chardev: add greeting, Daniel P. Berrange, 2009/11/23
- Re: [Qemu-devel] [PATCH 1/9] chardev: add greeting, Anthony Liguori, 2009/11/23
- Re: [Qemu-devel] [PATCH 1/9] chardev: add greeting, Gerd Hoffmann, 2009/11/23
[Qemu-devel] [PATCH 4/9] default devices: monitor, Gerd Hoffmann, 2009/11/17
[Qemu-devel] [PATCH 3/9] default devices: parallel port, Gerd Hoffmann, 2009/11/17
[Qemu-devel] [PATCH 8/9] default devices: drives, Gerd Hoffmann, 2009/11/17
[Qemu-devel] [PATCH 7/9] default devices: net,
Gerd Hoffmann <=
[Qemu-devel] [PATCH 5/9] zap serial_monitor_mux, Gerd Hoffmann, 2009/11/17
[Qemu-devel] [PATCH 9/9] default devices: global switch., Gerd Hoffmann, 2009/11/17
[Qemu-devel] [PATCH 6/9] default devices: vga, Gerd Hoffmann, 2009/11/17