auxbus: Convert a use of qdev_set_parent_bus()
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>
This commit is contained in:
parent
b7a1b5483e
commit
2214985408
|
@ -1268,7 +1268,7 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)
|
||||||
|
|
||||||
aux_bus_realize(s->aux_bus);
|
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);
|
aux_map_slave(AUX_SLAVE(s->dpcd), 0x0000);
|
||||||
|
|
||||||
qdev_realize_and_unref(DEVICE(s->edid), BUS(aux_get_i2c_bus(s->aux_bus)),
|
qdev_realize_and_unref(DEVICE(s->edid), BUS(aux_get_i2c_bus(s->aux_bus)),
|
||||||
|
|
|
@ -70,7 +70,6 @@ AUXBus *aux_bus_init(DeviceState *parent, const char *name)
|
||||||
bus = AUX_BUS(qbus_create(TYPE_AUX_BUS, parent, name));
|
bus = AUX_BUS(qbus_create(TYPE_AUX_BUS, parent, name));
|
||||||
auxtoi2c = object_new_with_props(TYPE_AUXTOI2C, OBJECT(bus), "i2c",
|
auxtoi2c = object_new_with_props(TYPE_AUXTOI2C, OBJECT(bus), "i2c",
|
||||||
&error_abort, NULL);
|
&error_abort, NULL);
|
||||||
qdev_set_parent_bus(DEVICE(auxtoi2c), BUS(bus));
|
|
||||||
|
|
||||||
bus->bridge = AUXTOI2C(auxtoi2c);
|
bus->bridge = AUXTOI2C(auxtoi2c);
|
||||||
|
|
||||||
|
@ -83,7 +82,7 @@ AUXBus *aux_bus_init(DeviceState *parent, const char *name)
|
||||||
|
|
||||||
void aux_bus_realize(AUXBus *bus)
|
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)
|
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);
|
dev = qdev_new(type);
|
||||||
assert(dev);
|
assert(dev);
|
||||||
qdev_set_parent_bus(dev, &bus->qbus);
|
|
||||||
return dev;
|
return dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue