[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 33/39] auxbus: Convert a use of qdev_set_parent_bus()
From: |
Markus Armbruster |
Subject: |
[PATCH v3 33/39] auxbus: Convert a use of qdev_set_parent_bus() |
Date: |
Tue, 9 Jun 2020 18:39:26 +0200 |
Convert qdev_set_parent_bus()/qdev_init_nofail() to qdev_realize();
recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/display/xlnx_dp.c | 2 +-
hw/misc/auxbus.c | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index a714cf8a50..884d29c8ce 100644
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -1268,7 +1268,7 @@ static void xlnx_dp_realize(DeviceState *dev, Error
**errp)
aux_bus_realize(s->aux_bus);
- qdev_init_nofail(DEVICE(s->dpcd));
+ qdev_realize(DEVICE(s->dpcd), BUS(s->aux_bus), &error_fatal);
aux_map_slave(AUX_SLAVE(s->dpcd), 0x0000);
qdev_realize_and_unref(DEVICE(s->edid), BUS(aux_get_i2c_bus(s->aux_bus)),
diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c
index 113f4278aa..e7a5d26158 100644
--- a/hw/misc/auxbus.c
+++ b/hw/misc/auxbus.c
@@ -70,7 +70,6 @@ AUXBus *aux_bus_init(DeviceState *parent, const char *name)
bus = AUX_BUS(qbus_create(TYPE_AUX_BUS, parent, name));
auxtoi2c = object_new_with_props(TYPE_AUXTOI2C, OBJECT(bus), "i2c",
&error_abort, NULL);
- qdev_set_parent_bus(DEVICE(auxtoi2c), BUS(bus));
bus->bridge = AUXTOI2C(auxtoi2c);
@@ -83,7 +82,7 @@ AUXBus *aux_bus_init(DeviceState *parent, const char *name)
void aux_bus_realize(AUXBus *bus)
{
- qdev_init_nofail(DEVICE(bus->bridge));
+ qdev_realize(DEVICE(bus->bridge), BUS(bus), &error_fatal);
}
void aux_map_slave(AUXSlave *aux_dev, hwaddr addr)
@@ -280,7 +279,6 @@ DeviceState *aux_create_slave(AUXBus *bus, const char *type)
dev = qdev_new(type);
assert(dev);
- qdev_set_parent_bus(dev, &bus->qbus);
return dev;
}
--
2.26.2
- [PATCH v3 12/39] qdev: Convert uses of qdev_set_parent_bus() manually, (continued)
- [PATCH v3 12/39] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/06/09
- [PATCH v3 32/39] auxbus: New aux_bus_realize(), pairing with aux_bus_init(), Markus Armbruster, 2020/06/09
- [PATCH v3 37/39] macio: Convert use of qdev_set_parent_bus(), Markus Armbruster, 2020/06/09
- [PATCH v3 35/39] qom: Tidy up a few object_initialize_child() calls, Markus Armbruster, 2020/06/09
- [PATCH v3 26/39] usb: New usb_new(), usb_realize_and_unref(), Markus Armbruster, 2020/06/09
- [PATCH v3 09/39] qdev: Convert uses of qdev_create() with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 02/39] Revert "hw/prep: realize the PCI root bus as part of the prep init", Markus Armbruster, 2020/06/09
- [PATCH v3 38/39] macio: Eliminate macio_init_child_obj(), Markus Armbruster, 2020/06/09
- [PATCH v3 34/39] auxbus: Eliminate aux_create_slave(), Markus Armbruster, 2020/06/09
- [PATCH v3 28/39] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 33/39] auxbus: Convert a use of qdev_set_parent_bus(),
Markus Armbruster <=
- [PATCH v3 29/39] usb: Eliminate usb_try_create_simple(), Markus Armbruster, 2020/06/09
- [PATCH v3 17/39] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 13/39] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/06/09
- [PATCH v3 22/39] ssi: ssi_auto_connect_slaves() never does anything, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 27/39] usb: Convert uses of usb_create(), Markus Armbruster, 2020/06/09
- [PATCH v3 11/39] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 04/39] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/06/09
- [PATCH v3 39/39] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, Markus Armbruster, 2020/06/09
- [PATCH v3 36/39] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/06/09
- [PATCH v3 31/39] auxbus: Rename aux_init_bus() to aux_bus_init(), Markus Armbruster, 2020/06/09