From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 17 Dec 2020 09:10:12 +0000 (+0100)
Subject: vl: initialize displays _after_ exiting preconfiguration
X-Git-Tag: v6.0.0-rc0~157^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=facf7c60ee;p=thirdparty%2Fqemu.git

vl: initialize displays _after_ exiting preconfiguration

Due to the renumbering of text consoles when graphical consoles are
created, init_displaystate must be called after all QemuConsoles are
created, i.e. after devices are created.

vl.c calls it from qemu_init_displays, while qmp_x_exit_preconfig is
where devices are created.  If qemu_init_displays is called before it,
the VGA graphical console does not come up.

Reported-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 0ed5c5ba934..7ddf405d767 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3529,10 +3529,10 @@ void qemu_init(int argc, char **argv, char **envp)
         exit(0);
     }
 
-    qemu_init_displays();
     if (!preconfig_requested) {
         qmp_x_exit_preconfig(&error_fatal);
     }
+    qemu_init_displays();
     accel_setup_post(current_machine);
     os_setup_post();
     resume_mux_open();