diff options
| author | Paolo Bonzini | 2020-10-21 22:08:53 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-11-03 19:17:27 +0100 |
| commit | e19c520fe6545230bf37c2458c6d97ed18cd0c4f (patch) | |
| tree | 30274fd2967940edfaf4625749575d798db7bbd3 /softmmu/vl.c | |
| parent | fuzz: fuzz offsets within pio/mmio regions (diff) | |
| download | qemu-e19c520fe6545230bf37c2458c6d97ed18cd0c4f.tar.gz qemu-e19c520fe6545230bf37c2458c6d97ed18cd0c4f.tar.xz qemu-e19c520fe6545230bf37c2458c6d97ed18cd0c4f.zip | |
semihosting: fix order of initialization functions
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>
Diffstat (limited to 'softmmu/vl.c')
| -rw-r--r-- | softmmu/vl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index a537a0377f..a71164494e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4284,9 +4284,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) @@ -4296,6 +4293,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) { |