From: Paolo Bonzini <pbonz...@redhat.com>
With --without-default-devices it is possible to build a binary that
does not include any USB host controller and therefore that does not
include the code guarded by CONFIG_USB. While the simpler creation
functions such as usb_create_simple can be inlined, this is not true
of usb_bus_find(). Remove it, replacing it with a search of the single
USB bus on the machine.
Suggested-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Message-ID: <20240223124406.234509-8-pbonz...@redhat.com>
[PMD: Fixed style]
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
hw/ppc/spapr.c | 4 +++-
hw/ppc/Kconfig | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d1c6d70d8d..55263f0815 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3024,8 +3024,10 @@ static void spapr_machine_init(MachineState *machine)
}
if (has_vga) {
- USBBus *usb_bus = usb_bus_find(-1);
+ USBBus *usb_bus;
+ usb_bus = USB_BUS(object_resolve_type_unambiguous(TYPE_USB_BUS,
+ &error_abort));
usb_create_simple(usb_bus, "usb-kbd");
usb_create_simple(usb_bus, "usb-mouse");
}
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index c5aeb6b3f2..b664d0eb37 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -1,5 +1,6 @@
config PSERIES
bool
+ imply USB_OHCI_PCI
imply PCI_DEVICES
imply TEST_DEVICES
imply VIRTIO_VGA
--
2.41.0
