diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-12-08 13:11:47 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-12 08:17:30 -0600 |
commit | 782e9e6554d2404689a156282622046538bccd17 (patch) | |
tree | 287cf852f8ac83f9e9bd87fae32810f997b88e70 /net.c | |
parent | default devices: add global cmd line option. (diff) | |
download | qemu-kvm-782e9e6554d2404689a156282622046538bccd17.tar.gz qemu-kvm-782e9e6554d2404689a156282622046538bccd17.tar.bz2 qemu-kvm-782e9e6554d2404689a156282622046538bccd17.zip |
default devices: network
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 <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit cb4522ccf67ba84d246291d9f75bd7f3df137d1a)
Diffstat (limited to 'net.c')
-rw-r--r-- | net.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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; } |