From e8386e4e4cc9020f2531fde3e2d8b17448782e69 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Wed, 17 Jun 2020 17:52:42 -0700
Subject: [PATCH] vl: Call xemu_input_init before vmload

---
 softmmu/vl.c | 5 +++++
 ui/xemu.c    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 63da28ebd4..532612bde9 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -116,6 +116,7 @@
 #include "ui/xemu-settings.h"
 #include "ui/xemu-notifications.h"
 #include "ui/xemu-net.h"
+#include "ui/xemu-input.h"
 
 #define MAX_VIRTIO_CONSOLES 1
 
@@ -4576,6 +4577,10 @@ void qemu_init(int argc, char **argv, char **envp)
     qemu_register_reset(resettable_cold_reset_fn, sysbus_get_default());
     qemu_run_machine_init_done_notifiers();
 
+#ifdef XBOX
+    xemu_input_init();
+#endif
+
     if (rom_check_and_register_reset() != 0) {
         error_report("rom check and register reset failed");
         exit(1);
diff --git a/ui/xemu.c b/ui/xemu.c
index 73a0ead944..aed34e17c1 100644
--- a/ui/xemu.c
+++ b/ui/xemu.c
@@ -863,7 +863,6 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
     assert(o->type == DISPLAY_TYPE_XEMU);
     SDL_GL_MakeCurrent(m_window, m_context);
 
-    xemu_input_init();
     xemu_settings_get_enum(XEMU_SETTINGS_DISPLAY_SCALE, &scaling_mode);
 
     memset(&info, 0, sizeof(info));
@@ -1444,6 +1443,7 @@ int main(int argc, char **argv)
 
     DPRINTF("Main thread: waiting for display_init_sem\n");
     qemu_sem_wait(&display_init_sem);
+
     DPRINTF("Main thread: initializing app\n");
 
     while (1) {