Revert "vl: Move input init to exit_preconfig"

This reverts commit a503458.
antangelo · Jul 28, 2023 · 16dd084 · 16dd084
1 parent a503458
commit 16dd084
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/softmmu/vl.c b/softmmu/vl.c
@@ -2651,8 +2651,6 @@ void qmp_x_exit_preconfig(Error **errp)
     qemu_create_cli_devices();
     qemu_machine_creation_done();
 
-    xemu_input_init();
-
     if (loadvm) {
         load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
     }

diff --git a/ui/xemu.c b/ui/xemu.c
@@ -1540,6 +1540,12 @@ int main(int argc, char **argv)
 
     DPRINTF("Main thread: initializing app\n");
 
+    qemu_mutex_lock_main_loop();
+    qemu_mutex_lock_iothread();
+    xemu_input_init();
+    qemu_mutex_unlock_iothread();
+    qemu_mutex_unlock_main_loop();
+
     while (1) {
         sdl2_gl_refresh(&sdl2_console[0].dcl);
         assert(glGetError() == GL_NO_ERROR);