From 5a1ee6077b89ee9a803aaf8d1c98004701f63684 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 30 Nov 2020 13:44:49 -0500 Subject: chardev: do not use machine_init_done machine_init_done is not the right flag to check when preconfig is taken into account; for example "./qemu-system-x86_64 -serial mon:stdio -preconfig" does not print the QEMU monitor header until after exit_preconfig. Add back a custom bool for mux character devices. This partially undoes commit c7278b4355 ("chardev: introduce chr_machine_done hook", 2018-03-12), but it keeps the cleaner logic using a function pointer in ChardevClass. Reviewed-by: Igor Mammedov Signed-off-by: Paolo Bonzini --- hw/core/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/core/machine.c b/hw/core/machine.c index 036609d9f3..07268afe52 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1179,7 +1179,7 @@ void machine_run_board_init(MachineState *machine) static NotifierList machine_init_done_notifiers = NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); -bool machine_init_done; +static bool machine_init_done; void qemu_add_machine_init_done_notifier(Notifier *notify) { -- cgit v1.2.3-55-g7522