[11/36] vl: create "-net nic -net user" default earlier

Commit Message

Paolo Bonzini Nov. 23, 2020, 2:14 p.m. UTC

Create it together with other default backends, even though the processing is
done later.

Reviewed-by: Igor Mammedov <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
---
 softmmu/vl.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Patch

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 10b6152e36..87c10f625c 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4249,6 +4249,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++;
@@ -4384,14 +4392,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);