From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: philmd@linaro.org, balaton@eik.bme.hu
Subject: [PATCH 08/10] usb: remove usb_bus_find
Date: Fri, 23 Feb 2024 13:44:04 +0100 [thread overview]
Message-ID: <20240223124406.234509-9-pbonzini@redhat.com> (raw)
In-Reply-To: <20240223124406.234509-1-pbonzini@redhat.com>
Inline the sole remaining use, which is for the -usbdevice command line.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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 cfeead28403..d46d96779ad 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 76fda41b7ec..796769fadb4 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.43.0
next prev parent reply other threads:[~2024-02-23 12:47 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-23 12:43 [PATCH 00/10] usb cleanups: remove usb_bus_find(), extract sysbus-ohci to a separate file Paolo Bonzini
2024-02-23 12:43 ` [PATCH 01/10] acpi, qom: move object_resolve_type_unambiguous to core QOM Paolo Bonzini
2024-02-23 17:02 ` Philippe Mathieu-Daudé
2024-02-26 7:00 ` Thomas Huth
2024-02-23 12:43 ` [PATCH 02/10] ppc: sam460ex: do not use usb_bus_find() Paolo Bonzini
2024-02-26 7:03 ` Thomas Huth
2024-02-26 7:39 ` Markus Armbruster
2024-02-26 7:41 ` Markus Armbruster
2024-02-26 10:46 ` BALATON Zoltan
2024-02-26 7:42 ` Markus Armbruster
2024-02-23 12:43 ` [PATCH 03/10] sh4: r2d: " Paolo Bonzini
2024-02-26 7:04 ` Thomas Huth
2024-02-23 12:44 ` [PATCH 04/10] mips/loongson3_virt: do not require CONFIG_USB Paolo Bonzini
2024-02-26 7:05 ` Thomas Huth
2024-02-26 7:42 ` Markus Armbruster
2024-02-23 12:44 ` [PATCH 05/10] hppa: " Paolo Bonzini
2024-02-23 17:19 ` Philippe Mathieu-Daudé
2024-02-23 19:23 ` Thomas Huth
2024-02-23 19:56 ` BALATON Zoltan
2024-02-24 22:38 ` Paolo Bonzini
2024-02-26 6:56 ` Thomas Huth
2024-02-23 12:44 ` [PATCH 06/10] mac_newworld: " Paolo Bonzini
2024-02-23 17:20 ` Philippe Mathieu-Daudé
2024-02-23 12:44 ` [PATCH 07/10] pseries: " Paolo Bonzini
2024-02-23 17:32 ` Philippe Mathieu-Daudé
2024-02-23 17:47 ` Paolo Bonzini
2024-02-23 12:44 ` Paolo Bonzini [this message]
2024-02-23 17:03 ` [PATCH 08/10] usb: remove usb_bus_find Philippe Mathieu-Daudé
2024-02-23 12:44 ` [PATCH 09/10] usb: extract sysbus-ohci to a separate file Paolo Bonzini
2024-02-23 17:10 ` Philippe Mathieu-Daudé
2024-02-26 7:14 ` Thomas Huth
2024-02-23 12:44 ` [PATCH 10/10] usb: remove duplicate file in system_ss Paolo Bonzini
2024-02-23 17:40 ` Philippe Mathieu-Daudé
2024-02-26 7:57 ` [PATCH 00/10] usb cleanups: remove usb_bus_find(), extract sysbus-ohci to a separate file Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240223124406.234509-9-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=balaton@eik.bme.hu \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).