diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-02-23 13:44:03 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-02-27 09:37:18 +0100 |
| commit | ae1011d43026cb72362cef139ed401d9ad0a1696 (patch) | |
| tree | b50c54e52567fd20f292d911e34448da5a514bb9 | |
| parent | 2dd2f2e0e226a0cc21fbc32341265a4736f7856e (diff) | |
| download | focaccia-qemu-ae1011d43026cb72362cef139ed401d9ad0a1696.tar.gz focaccia-qemu-ae1011d43026cb72362cef139ed401d9ad0a1696.zip | |
hw/ppc/pseries: do not require CONFIG_USB
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é <philmd@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20240223124406.234509-8-pbonzini@redhat.com> [PMD: Fixed style] Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
| -rw-r--r-- | hw/ppc/Kconfig | 1 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 4 |
2 files changed, 4 insertions, 1 deletions
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 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"); } |