[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/30] hw/mips/loongson3_virt: do not require CONFIG_USB
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 13/30] hw/mips/loongson3_virt: do not require CONFIG_USB |
Date: |
Tue, 27 Feb 2024 09:39:29 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Once the Kconfig for hw/mips is cleaned up, it will be 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 created by loongson3_virt_devices_init().
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20240223124406.234509-5-pbonzini@redhat.com>
[PMD: Fixed style]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/mips/loongson3_virt.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index caedde2df0..b10a611a98 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -446,9 +446,13 @@ static inline void
loongson3_virt_devices_init(MachineState *machine,
pci_vga_init(pci_bus);
if (defaults_enabled() && object_class_by_name("pci-ohci")) {
+ USBBus *usb_bus;
+
pci_create_simple(pci_bus, -1, "pci-ohci");
- usb_create_simple(usb_bus_find(-1), "usb-kbd");
- usb_create_simple(usb_bus_find(-1), "usb-tablet");
+ 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-tablet");
}
pci_init_nic_devices(pci_bus, mc->default_nic);
--
2.41.0
- [PULL 02/30] hw/display/pl110: Pass frame buffer memory region as link property, (continued)
- [PULL 02/30] hw/display/pl110: Pass frame buffer memory region as link property, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 03/30] hw/arm/exynos4210: Inline sysbus_create_varargs(EXYNOS4210_FIMD), Philippe Mathieu-Daudé, 2024/02/27
- [PULL 04/30] hw/display/exynos4210_fimd: Pass frame buffer memory region as link, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 05/30] hw/i386/kvmvapic: Inline sysbus_address_space(), Philippe Mathieu-Daudé, 2024/02/27
- [PULL 06/30] hw/sysbus: Remove now unused sysbus_address_space(), Philippe Mathieu-Daudé, 2024/02/27
- [PULL 08/30] hw/nubus: increase maximum Declaration ROM size from 128k to 1Mb, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 09/30] hw/nubus: add nubus-virtio-mmio device, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 10/30] hw/acpi: move object_resolve_type_unambiguous to core QOM, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 11/30] hw/ppc/sam460ex: do not use usb_bus_find(), Philippe Mathieu-Daudé, 2024/02/27
- [PULL 12/30] hw/sh4/r2d: do not use usb_bus_find(), Philippe Mathieu-Daudé, 2024/02/27
- [PULL 13/30] hw/mips/loongson3_virt: do not require CONFIG_USB,
Philippe Mathieu-Daudé <=
- [PULL 16/30] hw/ppc/pseries: do not require CONFIG_USB, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 18/30] hw/usb: extract sysbus-ohci to a separate file, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 14/30] hw/hppa: do not require CONFIG_USB, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 15/30] hw/ppc/mac_newworld: do not require CONFIG_USB, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 17/30] hw/usb: remove usb_bus_find, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 19/30] hw/usb: remove duplicate file in system_ss, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 20/30] hw/nvme: fix invalid endian conversion, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 21/30] hw/i386/x86: Let ioapic_init_gsi() take parent as pointer, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 22/30] hw/i386/sgx: Use QDev API, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 23/30] hw/i386/q35: Include missing 'hw/acpi/acpi.h' header, Philippe Mathieu-Daudé, 2024/02/27