[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/8] hw/usb: Convert to qdev_realize()
From: |
Gerd Hoffmann |
Subject: |
[PULL 3/8] hw/usb: Convert to qdev_realize() |
Date: |
Fri, 22 Jan 2021 18:48:44 +0100 |
From: Markus Armbruster <armbru@redhat.com>
Device code shouldn't mess with QOM property "realized" since we have
proper interfaces (merge commit 6675a653). Commit 8ddab8dd3d
"usb/hcd-xhci: Split pci wrapper for xhci base model" and commit
f00ff136ee "usb: hcd-xhci-sysbus: Attach xhci to sysbus device"
reintroduced two instances. Clean them up. Note that s->xhci is
a (bus-less) TYPE_XHCI device.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210119120151.53757-1-armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/hcd-xhci-pci.c | 4 +---
hw/usb/hcd-xhci-sysbus.c | 5 +----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c
index bba628d3d230..9421734d0fe2 100644
--- a/hw/usb/hcd-xhci-pci.c
+++ b/hw/usb/hcd-xhci-pci.c
@@ -115,9 +115,7 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev,
Error **errp)
object_property_set_link(OBJECT(&s->xhci), "host", OBJECT(s), NULL);
s->xhci.intr_update = xhci_pci_intr_update;
s->xhci.intr_raise = xhci_pci_intr_raise;
- object_property_set_bool(OBJECT(&s->xhci), "realized", true, &err);
- if (err) {
- error_propagate(errp, err);
+ if (!qdev_realize(DEVICE(&s->xhci), NULL, errp)) {
return;
}
if (strcmp(object_get_typename(OBJECT(dev)), TYPE_NEC_XHCI) == 0) {
diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c
index 29185d2261fb..42e2574c8298 100644
--- a/hw/usb/hcd-xhci-sysbus.c
+++ b/hw/usb/hcd-xhci-sysbus.c
@@ -33,12 +33,9 @@ void xhci_sysbus_reset(DeviceState *dev)
static void xhci_sysbus_realize(DeviceState *dev, Error **errp)
{
XHCISysbusState *s = XHCI_SYSBUS(dev);
- Error *err = NULL;
object_property_set_link(OBJECT(&s->xhci), "host", OBJECT(s), NULL);
- object_property_set_bool(OBJECT(&s->xhci), "realized", true, &err);
- if (err) {
- error_propagate(errp, err);
+ if (!qdev_realize(DEVICE(&s->xhci), NULL, errp)) {
return;
}
s->irq = g_new0(qemu_irq, s->xhci.numintrs);
--
2.29.2
- [PULL 0/8] Usb 20210122 patches, Gerd Hoffmann, 2021/01/22
- [PULL 4/8] hw/usb/hcd-xhci: Fix extraneous format-truncation error on 32-bit hosts, Gerd Hoffmann, 2021/01/22
- [PULL 1/8] hw/usb/host-libusb.c: fix build with kernel < 5.0, Gerd Hoffmann, 2021/01/22
- [PULL 3/8] hw/usb: Convert to qdev_realize(),
Gerd Hoffmann <=
- [PULL 2/8] hw/usb: Fix bad printf format specifiers, Gerd Hoffmann, 2021/01/22
- [PULL 5/8] scsi/utils: Add INVALID_PARAM_VALUE sense code definition, Gerd Hoffmann, 2021/01/22
- [PULL 8/8] usb-host: map LIBUSB_SPEED_SUPER_PLUS to USB_SPEED_SUPER, Gerd Hoffmann, 2021/01/22
- [PULL 6/8] hw/usb/dev-uas: Report command additional adb length as unsupported, Gerd Hoffmann, 2021/01/22
- [PULL 7/8] usb: add pcap support., Gerd Hoffmann, 2021/01/22
- Re: [PULL 0/8] Usb 20210122 patches, Peter Maydell, 2021/01/23