[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/29] semihosting: fix order of initialization functions
From: |
Paolo Bonzini |
Subject: |
[PATCH 02/29] semihosting: fix order of initialization functions |
Date: |
Tue, 27 Oct 2020 14:21:17 -0400 |
qemu_semihosting_console_init uses semihosting.chardev which is set
by qemu_semihosting_connect_chardevs. Thus qemu_semihosting_connect_chardevs
has to be called first.
Both have to be called after processing -serial and friends though, so
that the semihosting console can connect to a multiplexer as in
"-serial mon:stdio -semihosting-config chardev=serial0"
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Fixes: 619985e937 ("semihosting: defer connect_chardevs a little more to use
serialx", 2020-07-27)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/vl.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index d39d914dd0..b0ccfd750a 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4280,9 +4280,6 @@ void qemu_init(int argc, char **argv, char **envp)
qemu_opts_foreach(qemu_find_opts("mon"),
mon_init_func, NULL, &error_fatal);
- /* connect semihosting console input if requested */
- qemu_semihosting_console_init();
-
if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)
exit(1);
if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0)
@@ -4292,6 +4289,7 @@ void qemu_init(int argc, char **argv, char **envp)
/* now chardevs have been created we may have semihosting to connect */
qemu_semihosting_connect_chardevs();
+ qemu_semihosting_console_init();
/* If no default VGA is requested, the default is "none". */
if (default_vga) {
--
2.26.2
- [RFC PATCH v2 00/37] cleanup qemu_init and make sense of command line processing, Paolo Bonzini, 2020/10/27
- [PATCH 05/29] vl: split various early command line options to a separate function, Paolo Bonzini, 2020/10/27
- [PATCH 04/29] vl: remove bogus check, Paolo Bonzini, 2020/10/27
- [PATCH 06/29] vl: move various initialization routines out of qemu_init, Paolo Bonzini, 2020/10/27
- [PATCH 02/29] semihosting: fix order of initialization functions,
Paolo Bonzini <=
- [PATCH 07/29] vl: extract qemu_init_subsystems, Paolo Bonzini, 2020/10/27
- [PATCH 10/29] vl: preconfig and loadvm are mutually exclusive, Paolo Bonzini, 2020/10/27
- [PATCH 13/29] vl: load plugins as late as possible, Paolo Bonzini, 2020/10/27
- [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