From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 21 Oct 2020 10:01:30 +0000 (-0400)
Subject: vl: create "-net nic -net user" default earlier
X-Git-Tag: v6.0.0-rc0~189^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8a798f62e0c0bc5f7bf4968f52ed5e9a6357465;p=thirdparty%2Fqemu.git

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>
---

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 5571f9ff75e..a4b87ae742c 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);