hw/usb: Convert to qdev_realize()
PATCH 1/1 hw/usb: Convert to qdev_realize()
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.
--- hw/usb/hcd-xhci-pci.c | 4 +--- hw/usb/hcd-xhci-sysbus.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-)
hw/usb/hcd-xhci-pci.c +1 -3
@@ -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 ) {
hw/usb/hcd-xhci-sysbus.c +1 -4
@@ -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);
Signature · 1 line
2.26.2
Quoted 7 lines · Markus Armbruster
Device code shouldn't mess with QOM property "realized" since we have proper interfaces (merge commit
6675a653). Commit8ddab8dd3d"usb/hcd-xhci: Split pci wrapper for xhci base model" and commitf00ff136ee"usb: hcd-xhci-sysbus: Attach xhci to sysbus device" reintroduced two instances. Clean them up. Note thats->xhciis a (bus-less)TYPE_XHCIdevice.
Quoted 5 lines
Signed-off-by Markus Armbruster <[email protected]>--- hw/usb/hcd-xhci-pci.c | 4 +--- hw/usb/hcd-xhci-sysbus.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-)
Quoted 6 lines · Markus Armbruster
Device code shouldn't mess with QOM property "realized" since we have proper interfaces (merge commit
6675a653). Commit8ddab8dd3d"usb/hcd-xhci: Split pci wrapper for xhci base model" and commitf00ff136ee"usb: hcd-xhci-sysbus: Attach xhci to sysbus device" reintroduced two instances. Clean them up. Note thats->xhciis a (bus-less)TYPE_XHCIdevice.
Added to usb queue.
thanks,
Gerd