summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini2020-10-21 12:01:30 +0200
committerPaolo Bonzini2020-12-10 18:15:12 +0100
commitd8a798f62e0c0bc5f7bf4968f52ed5e9a6357465 (patch)
tree77ec73c488b0c17d559b0d2780f811daf535eb4c
parentqemu-option: restrict qemu_opts_set to merge-lists QemuOpts (diff)
downloadqemu-d8a798f62e0c0bc5f7bf4968f52ed5e9a6357465.tar.gz
qemu-d8a798f62e0c0bc5f7bf4968f52ed5e9a6357465.tar.xz
qemu-d8a798f62e0c0bc5f7bf4968f52ed5e9a6357465.zip
vl: create "-net nic -net user" default earlier
Create it together with other default backends, even though the processing is done later. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--softmmu/vl.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 5571f9ff75..a4b87ae742 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4253,6 +4253,14 @@ void qemu_init(int argc, char **argv, char **envp)
monitor_parse("vc:80Cx24C", "readline", false);
}
+ if (default_net) {
+ QemuOptsList *net = qemu_find_opts("net");
+ qemu_opts_parse(net, "nic", true, &error_abort);
+#ifdef CONFIG_SLIRP
+ qemu_opts_parse(net, "user", true, &error_abort);
+#endif
+ }
+
#if defined(CONFIG_VNC)
if (!QTAILQ_EMPTY(&(qemu_find_opts("vnc")->head))) {
display_remote++;
@@ -4388,14 +4396,6 @@ void qemu_init(int argc, char **argv, char **envp)
semihosting_arg_fallback(kernel_filename, kernel_cmdline);
}
- if (default_net) {
- QemuOptsList *net = qemu_find_opts("net");
- qemu_opts_parse(net, "nic", true, &error_abort);
-#ifdef CONFIG_SLIRP
- qemu_opts_parse(net, "user", true, &error_abort);
-#endif
- }
-
if (net_init_clients(&err) < 0) {
error_report_err(err);
exit(1);