[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 28/55] usb: Eliminate usb_try_create_simple()
From: |
Markus Armbruster |
Subject: |
[PATCH 28/55] usb: Eliminate usb_try_create_simple() |
Date: |
Tue, 19 May 2020 16:55:24 +0200 |
usb_try_create_simple() is qdev_try_new() and qdev_realize_and_unref()
with more verbose error messages. Of its two users, one ignores
errors, and the other asserts they are impossible.
Make them use qdev_try_new() and qdev_realize_and_unref() directly,
and eliminate usb_try_create_simple
Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/usb/bus.c | 37 ++++++++++++++-----------------------
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 5c4d31614e..a81aee2051 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -318,35 +318,22 @@ USBDevice *usb_new(const char *name)
return USB_DEVICE(qdev_new(name));
}
+static USBDevice *usb_try_new(const char *name)
+{
+ return USB_DEVICE(qdev_try_new(name));
+}
+
bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp)
{
return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp);
}
-static USBDevice *usb_try_create_simple(USBBus *bus, const char *name,
- Error **errp)
-{
- Error *err = NULL;
- DeviceState *dev;
-
- dev = qdev_try_new(name);
- if (!dev) {
- error_setg(errp, "Failed to create USB device '%s'", name);
- return NULL;
- }
- qdev_realize_and_unref(dev, &bus->qbus, &err);
- if (err) {
- error_propagate_prepend(errp, err,
- "Failed to initialize USB device '%s': ",
- name);
- return NULL;
- }
- return USB_DEVICE(dev);
-}
-
USBDevice *usb_create_simple(USBBus *bus, const char *name)
{
- return usb_try_create_simple(bus, name, &error_abort);
+ USBDevice *dev = usb_new(name);
+
+ usb_realize_and_unref(dev, bus, &error_abort);
+ return dev;
}
static void usb_fill_port(USBPort *port, void *opaque, int index,
@@ -426,6 +413,7 @@ void usb_claim_port(USBDevice *dev, Error **errp)
{
USBBus *bus = usb_bus_from_device(dev);
USBPort *port;
+ USBDevice *hub;
assert(dev->port == NULL);
@@ -443,7 +431,10 @@ void usb_claim_port(USBDevice *dev, Error **errp)
} else {
if (bus->nfree == 1 && strcmp(object_get_typename(OBJECT(dev)),
"usb-hub") != 0) {
/* Create a new hub and chain it on */
- usb_try_create_simple(bus, "usb-hub", NULL);
+ hub = usb_try_new("usb-hub");
+ if (hub) {
+ usb_realize_and_unref(hub, bus, NULL);
+ }
}
if (bus->nfree == 0) {
error_setg(errp, "tried to attach usb device %s to a bus "
--
2.21.1
- Re: [PATCH 22/55] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle, (continued)
- [PATCH 27/55] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/05/19
- [PATCH 45/55] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1, Markus Armbruster, 2020/05/19
- [PATCH 53/55] qdev: Convert bus-less devices to qdev_realize() with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 08/55] qdev: Convert uses of qdev_create() with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 28/55] usb: Eliminate usb_try_create_simple(),
Markus Armbruster <=
- [PATCH 43/55] sysbus: Convert to sysbus_realize() etc. with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 55/55] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well, Markus Armbruster, 2020/05/19
- [PATCH 21/55] ssi: ssi_auto_connect_slaves() never does anything, drop, Markus Armbruster, 2020/05/19
- [PATCH 29/55] qdev: qdev_create(), qdev_try_create() are now unused, drop, Markus Armbruster, 2020/05/19
- [PATCH 46/55] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2, Markus Armbruster, 2020/05/19
- [PATCH 50/55] s390x/event-facility: Simplify creation of SCLP event devices, Markus Armbruster, 2020/05/19