[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 53/84] usb: Convert uses of usb_create()
From: |
Markus Armbruster |
Subject: |
[PULL 53/84] usb: Convert uses of usb_create() |
Date: |
Mon, 15 Jun 2020 22:39:37 +0200 |
Replace
dev = usb_create(bus, type_name);
...
object_property_set_bool(OBJECT(dev), true, "realized", &err);
by
dev = isa_new(type_name);
...
usb_realize_and_unref(dev, bus, &err);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
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-28-armbru@redhat.com>
---
include/hw/usb.h | 3 +--
hw/usb/bus.c | 11 +++++------
hw/usb/dev-serial.c | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/hw/usb.h b/include/hw/usb.h
index 1cc0ba0fed..dce16c792b 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -502,8 +502,7 @@ void usb_bus_new(USBBus *bus, size_t bus_size,
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)(USBBus *bus,
- const char *params));
+ USBDevice *(*usbdevice_init)(const char *params));
USBDevice *usb_new(const char *name);
bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp);
USBDevice *usb_create(USBBus *bus, const char *name);
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 6b0d9f9e4d..da85b8b005 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -296,14 +296,13 @@ typedef struct LegacyUSBFactory
{
const char *name;
const char *usbdevice_name;
- USBDevice *(*usbdevice_init)(USBBus *bus, const char *params);
+ USBDevice *(*usbdevice_init)(const char *params);
} LegacyUSBFactory;
static GSList *legacy_usb_factory;
void usb_legacy_register(const char *typename, const char *usbdevice_name,
- USBDevice *(*usbdevice_init)(USBBus *bus,
- const char *params))
+ USBDevice *(*usbdevice_init)(const char *params))
{
if (usbdevice_name) {
LegacyUSBFactory *f = g_malloc0(sizeof(*f));
@@ -710,19 +709,19 @@ USBDevice *usbdevice_create(const char *cmdline)
}
if (f->usbdevice_init) {
- dev = f->usbdevice_init(bus, params);
+ dev = f->usbdevice_init(params);
} else {
if (*params) {
error_report("usbdevice %s accepts no params", driver);
return NULL;
}
- dev = usb_create(bus, f->name);
+ dev = usb_new(f->name);
}
if (!dev) {
error_report("Failed to create USB device '%s'", f->name);
return NULL;
}
- object_property_set_bool(OBJECT(dev), true, "realized", &err);
+ usb_realize_and_unref(dev, bus, &err);
if (err) {
error_reportf_err(err, "Failed to initialize USB device '%s': ",
f->name);
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index d2c03681b7..7e50e3ba47 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -542,7 +542,7 @@ static void usb_serial_realize(USBDevice *dev, Error **errp)
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
}
-static USBDevice *usb_braille_init(USBBus *bus, const char *unused)
+static USBDevice *usb_braille_init(const char *unused)
{
USBDevice *dev;
Chardev *cdrv;
@@ -551,7 +551,7 @@ static USBDevice *usb_braille_init(USBBus *bus, const char
*unused)
if (!cdrv)
return NULL;
- dev = usb_create(bus, "usb-braille");
+ dev = usb_new("usb-braille");
qdev_prop_set_chr(&dev->qdev, "chardev", cdrv);
return dev;
}
--
2.26.2
- [PULL 37/84] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, (continued)
- [PULL 37/84] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 30/84] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/06/15
- [PULL 29/84] Revert "hw/versatile: realize the PCI root bus as part of the versatile init", Markus Armbruster, 2020/06/15
- [PULL 26/84] qdev: Assert onboard devices all get realized properly, Markus Armbruster, 2020/06/15
- [PULL 40/84] hw/ppc: Eliminate two superfluous QOM casts, Markus Armbruster, 2020/06/15
- [PULL 23/84] sparc/leon3: Fix to put grlib,* devices on sysbus, Markus Armbruster, 2020/06/15
- [PULL 46/84] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/06/15
- [PULL 41/84] pci: Convert uses of pci_create() etc. with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 47/84] isa: isa_create(), isa_try_create() are now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 51/84] ssi: ssi_create_slave_no_init() is now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 53/84] usb: Convert uses of usb_create(),
Markus Armbruster <=
- [PULL 32/84] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/06/15
- [PULL 69/84] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2, Markus Armbruster, 2020/06/15
- [PULL 68/84] hw/arm/armsse: Pass correct child size to sysbus_init_child_obj(), Markus Armbruster, 2020/06/15
- [PULL 38/84] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/06/15
- [PULL 49/84] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 44/84] isa: New isa_new(), isa_realize_and_unref() etc., Markus Armbruster, 2020/06/15
- [PULL 42/84] pci: Convert uses of pci_create() etc. manually, Markus Armbruster, 2020/06/15
- [PULL 01/84] qom: Constify object_get_canonical_path{, _component}()'s parameter, Markus Armbruster, 2020/06/15
- [PULL 45/84] isa: Convert uses of isa_create() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 57/84] auxbus: Rename aux_init_bus() to aux_bus_init(), Markus Armbruster, 2020/06/15