ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "vl: Move input init to exit_preconfig" 

This reverts commit a5034584c0.
This commit is contained in:
Matt Borgerson 2023-07-28 16:31:15 -07:00
parent a5034584c0
commit 16dd084612
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
softmmu/vl.c
View File

@ -2651,8 +2651,6 @@ void qmp_x_exit_preconfig(Error **errp)
qemu_create_cli_devices(); qemu_create_cli_devices();
qemu_machine_creation_done(); qemu_machine_creation_done();
xemu_input_init();
if (loadvm) { if (loadvm) {
load_snapshot(loadvm, NULL, false, NULL, &error_fatal); load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
} }

6
ui/xemu.c
View File

@ -1540,6 +1540,12 @@ int main(int argc, char **argv)
DPRINTF("Main thread: initializing app\n"); 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) { while (1) {
sdl2_gl_refresh(&sdl2_console[0].dcl); sdl2_gl_refresh(&sdl2_console[0].dcl);
assert(glGetError() == GL_NO_ERROR); assert(glGetError() == GL_NO_ERROR);