[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/30] hw/usb: remove usb_bus_find
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 17/30] hw/usb: remove usb_bus_find |
Date: |
Tue, 27 Feb 2024 09:39:33 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Inline the sole remaining use, which is for the -usbdevice command line.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240223124406.234509-9-pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/usb.h | 1 -
hw/usb/bus.c | 15 +--------------
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/include/hw/usb.h b/include/hw/usb.h
index cfeead2840..d46d96779a 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -498,7 +498,6 @@ struct USBBusOps {
void usb_bus_new(USBBus *bus, size_t bus_size,
USBBusOps *ops, DeviceState *host);
void usb_bus_release(USBBus *bus);
-USBBus *usb_bus_find(int busnr);
void usb_legacy_register(const char *typename, const char *usbdevice_name,
USBDevice *(*usbdevice_init)(void));
USBDevice *usbdevice_create(const char *cmdline);
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 76fda41b7e..796769fadb 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -100,19 +100,6 @@ void usb_bus_release(USBBus *bus)
QTAILQ_REMOVE(&busses, bus, next);
}
-USBBus *usb_bus_find(int busnr)
-{
- USBBus *bus;
-
- if (-1 == busnr)
- return QTAILQ_FIRST(&busses);
- QTAILQ_FOREACH(bus, &busses, next) {
- if (bus->busnr == busnr)
- return bus;
- }
- return NULL;
-}
-
static void usb_device_realize(USBDevice *dev, Error **errp)
{
USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);
@@ -643,7 +630,7 @@ HumanReadableText *qmp_x_query_usb(Error **errp)
/* handle legacy -usbdevice cmd line option */
USBDevice *usbdevice_create(const char *driver)
{
- USBBus *bus = usb_bus_find(-1 /* any */);
+ USBBus *bus = QTAILQ_FIRST(&busses);
LegacyUSBFactory *f = NULL;
Error *err = NULL;
GSList *i;
--
2.41.0
- [PULL 08/30] hw/nubus: increase maximum Declaration ROM size from 128k to 1Mb, (continued)
- [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é, 2024/02/27
- [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é <=
- [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
- [PULL 24/30] hw/i386/pc: Rename "bus" attribute to "pcibus", Philippe Mathieu-Daudé, 2024/02/27
- [PULL 25/30] hw/i386/pc_{piix, q35}: Eliminate local pci_bus/pci_host variables, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 26/30] hw/i386/pc: Remove unneeded class attribute "kvmclock_enabled", Philippe Mathieu-Daudé, 2024/02/27
- [PULL 27/30] hw/i386/pc: Populate RTC attribute directly, Philippe Mathieu-Daudé, 2024/02/27
- [PULL 28/30] hw/arm/sbsa-ref: Do not open-code ahci_ide_create_devs(), Philippe Mathieu-Daudé, 2024/02/27