[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/29] vl: create "-net nic -net user" default earlier
From: |
Paolo Bonzini |
Subject: |
[PATCH 12/29] vl: create "-net nic -net user" default earlier |
Date: |
Tue, 27 Oct 2020 14:21:27 -0400 |
Create it together with other default backends, even though the processing is
done later.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/vl.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 6749109b29..f643333f7e 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4254,6 +4254,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_set(net, NULL, "type", "nic", &error_abort);
+#ifdef CONFIG_SLIRP
+ qemu_opts_set(net, NULL, "type", "user", &error_abort);
+#endif
+ }
+
#if defined(CONFIG_VNC)
if (!QTAILQ_EMPTY(&(qemu_find_opts("vnc")->head))) {
display_remote++;
@@ -4389,14 +4397,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_set(net, NULL, "type", "nic", &error_abort);
-#ifdef CONFIG_SLIRP
- qemu_opts_set(net, NULL, "type", "user", &error_abort);
-#endif
- }
-
if (net_init_clients(&err) < 0) {
error_report_err(err);
exit(1);
--
2.26.2
- [PATCH 03/29] vl: extract validation of -smp to machine.c, (continued)
- [PATCH 03/29] vl: extract validation of -smp to machine.c, Paolo Bonzini, 2020/10/27
- [PATCH 09/29] vl: extract various command line validation snippets to a new function, Paolo Bonzini, 2020/10/27
- [PATCH 11/29] vl: extract various command line desugaring snippets to a new function, Paolo Bonzini, 2020/10/27
- [PATCH 01/29] trace: remove argument from trace_init_file, Paolo Bonzini, 2020/10/27
- [PATCH 08/29] vl: move prelaunch part of qemu_init to new functions, Paolo Bonzini, 2020/10/27
- [PATCH 15/29] vl: extract default devices to separate functions, Paolo Bonzini, 2020/10/27
- [PATCH 23/29] vl: move -global check earlier, Paolo Bonzini, 2020/10/27
- [PATCH 16/29] vl: move CHECKPOINT_INIT after preconfig, Paolo Bonzini, 2020/10/27
- [PATCH 20/29] vl: separate qemu_apply_machine_options, Paolo Bonzini, 2020/10/27
- [PATCH 22/29] vl: initialize displays before preconfig loop, Paolo Bonzini, 2020/10/27
- [PATCH 12/29] vl: create "-net nic -net user" default earlier,
Paolo Bonzini <=
- [PATCH 21/29] vl: separate qemu_resolve_machine_memdev, Paolo Bonzini, 2020/10/27
- [PATCH 24/29] migration, vl: start migration via qmp_migrate_incoming, Paolo Bonzini, 2020/10/27
- [PATCH 14/29] vl: move semihosting command line fallback to qemu_finish_machine_init, Paolo Bonzini, 2020/10/27
- [PATCH 29/29] vl: allow -incoming defer with -preconfig, Paolo Bonzini, 2020/10/27
- [PATCH 28/29] vl: remove separate preconfig main_loop, Paolo Bonzini, 2020/10/27
- [PATCH 18/29] vl: separate qemu_create_late_backends, Paolo Bonzini, 2020/10/27
- [PATCH 26/29] hmp: introduce cmd_available, Paolo Bonzini, 2020/10/27
- [PATCH 25/29] vl: start VM via qmp_cont, Paolo Bonzini, 2020/10/27
- [PATCH 17/29] vl: separate qemu_create_early_backends, Paolo Bonzini, 2020/10/27
- [PATCH 19/29] vl: separate qemu_create_machine, Paolo Bonzini, 2020/10/27