[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 59/84] auxbus: Convert a use of qdev_set_parent_bus()
From: |
Markus Armbruster |
Subject: |
[PULL 59/84] auxbus: Convert a use of qdev_set_parent_bus() |
Date: |
Mon, 15 Jun 2020 22:39:43 +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>
Message-Id: <20200610053247.1583243-34-armbru@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 75b6de1c63..5c9c23a336 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
- [PULL 78/84] microbit: Eliminate two local variables in microbit_init(), (continued)
- [PULL 78/84] microbit: Eliminate two local variables in microbit_init(), Markus Armbruster, 2020/06/15
- [PULL 80/84] qdev: Make qdev_realize() support bus-less devices, Markus Armbruster, 2020/06/15
- [PULL 76/84] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4, Markus Armbruster, 2020/06/15
- [PULL 70/84] sysbus: New sysbus_realize(), sysbus_realize_and_unref(), Markus Armbruster, 2020/06/15
- [PULL 67/84] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1, Markus Armbruster, 2020/06/15
- [PULL 82/84] qdev: Convert bus-less devices to qdev_realize() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 79/84] s390x/event-facility: Simplify creation of SCLP event devices, Markus Armbruster, 2020/06/15
- [PULL 48/84] ssi: ssi_auto_connect_slaves() never does anything, drop, Markus Armbruster, 2020/06/15
- [PULL 61/84] qom: Tidy up a few object_initialize_child() calls, Markus Armbruster, 2020/06/15
- [PULL 60/84] auxbus: Eliminate aux_create_slave(), Markus Armbruster, 2020/06/15
- [PULL 59/84] auxbus: Convert a use of qdev_set_parent_bus(),
Markus Armbruster <=
- [PULL 75/84] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3, Markus Armbruster, 2020/06/15
- [PULL 62/84] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/06/15
- [PULL 71/84] sysbus: Convert to sysbus_realize() etc. with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 64/84] macio: Eliminate macio_init_child_obj(), Markus Armbruster, 2020/06/15
- [PULL 73/84] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1, Markus Armbruster, 2020/06/15
- [PULL 77/84] sysbus: sysbus_init_child_obj() is now unused, drop, Markus Armbruster, 2020/06/15
- Re: [PULL 00/84] QOM patches for 2020-06-15, Peter Maydell, 2020/06/16
- Re: [PULL 00/84] QOM patches for 2020-06-15, Peter Maydell, 2020/06/26