OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

usb: Eliminate usb_try_create_simple()

Browse Source 
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 <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-30-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-06-10 07:32:18 +02:00
parent 8cd81a9e55
commit 535770518f
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/usb/bus.c
View File

@ -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 "