diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2016-05-12 11:17:16 -0300 |
---|---|---|
committer | Jason Wang <jasowang@redhat.com> | 2016-06-01 09:25:29 +0800 |
commit | d30300f771bffc3964e86472e0c21607521a2e24 (patch) | |
tree | e4dd0964a5358fa55dfebf762562e910acd58434 /net | |
parent | 3af9187fc6caaf415ab9c0c6d92c9678f65cb17f (diff) | |
download | qemu-d30300f771bffc3964e86472e0c21607521a2e24.zip qemu-d30300f771bffc3964e86472e0c21607521a2e24.tar.gz qemu-d30300f771bffc3964e86472e0c21607521a2e24.tar.bz2 |
net: vl: Move default_net to vl.c
All handling of defaults (default_* variables) is inside vl.c,
move default_net there too, so we can more easily refactor that
code later.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/net.c | 23 |
1 files changed, 0 insertions, 23 deletions
@@ -76,8 +76,6 @@ const char *host_net_devices[] = { NULL, }; -int default_net = 1; - /***********************************************************/ /* network device redirectors */ @@ -1415,18 +1413,6 @@ void net_check_clients(void) NetClientState *nc; int i; - /* Don't warn about the default network setup that you get if - * no command line -net or -netdev options are specified. There - * are two cases that we would otherwise complain about: - * (1) board doesn't support a NIC but the implicit "-net nic" - * requested one - * (2) CONFIG_SLIRP not set, in which case the implicit "-net nic" - * sets up a nic that isn't connected to anything. - */ - if (default_net) { - return; - } - net_hub_check_clients(); QTAILQ_FOREACH(nc, &net_clients, next) { @@ -1483,14 +1469,6 @@ int net_init_clients(void) { QemuOptsList *net = qemu_find_opts("net"); - if (default_net) { - /* if no clients, we use a default config */ - qemu_opts_set(net, NULL, "type", "nic", &error_abort); -#ifdef CONFIG_SLIRP - qemu_opts_set(net, NULL, "type", "user", &error_abort); -#endif - } - net_change_state_entry = qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL); @@ -1521,7 +1499,6 @@ int net_client_parse(QemuOptsList *opts_list, const char *optarg) return -1; } - default_net = 0; return 0; } |