From d219d92214ce6db831473b76014d8325d4e9feda Mon Sep 17 00:00:00 2001
From: Antonio Abbatangelo <antonio.abbatangelo@gmail.com>
Date: Mon, 15 Aug 2022 15:38:03 -0400
Subject: [PATCH] vl: Initialize usb daughterboard at machine start

---
 softmmu/vl.c    | 4 ++++
 ui/xemu-input.c | 9 ---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 2eecce1cd7..1ca15676fe 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2966,6 +2966,10 @@ void qemu_init(int argc, char **argv, char **envp)
     fake_argv[fake_argc++] = strdup("-display");
     fake_argv[fake_argc++] = strdup("xemu");
 
+    // Create USB Daughterboard for 1.0 Xbox. This is connected to Port 1 of the Root hub.
+    fake_argv[fake_argc++] = strdup("-device");
+    fake_argv[fake_argc++] = strdup("usb-hub,port=1,ports=4");
+
 #ifdef _WIN32
     // FIXME: Create this dummy device to prevent logspam
     fake_argv[fake_argc++] = strdup("-audiodev");
diff --git a/ui/xemu-input.c b/ui/xemu-input.c
index b8ca2bd69c..0db2932368 100644
--- a/ui/xemu-input.c
+++ b/ui/xemu-input.c
@@ -148,15 +148,6 @@ void xemu_input_init(void)
         }
     }
 
-    // Create USB Daughterboard for 1.0 Xbox. This is connected to Port 1 of the Root hub.
-    QDict *usbhub_qdict = qdict_new();
-    qdict_put_str(usbhub_qdict, "driver", "usb-hub");
-    qdict_put_int(usbhub_qdict, "port", 1);
-    qdict_put_int(usbhub_qdict, "ports", 4);
-    QemuOpts *usbhub_opts = qemu_opts_from_qdict(qemu_find_opts("device"), usbhub_qdict, &error_fatal);
-    DeviceState *usbhub_dev = qdev_device_add(usbhub_opts, &error_fatal);
-    assert(usbhub_dev);
-
     // Check to see if we should auto-bind the keyboard
     int port = xemu_input_get_controller_default_bind_port(new_con, 0);
     if (port >= 0) {