mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
qbus: Rename qbus_create_inplace() to qbus_init()
Rename qbus_create_inplace() to qbus_init(); this is more in line with our usual naming convention for functions that in-place initialize objects. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 20210923121153.23754-5-peter.maydell@linaro.org
This commit is contained in:
parent
8d4cdf01f8
commit
d637e1dc6d
32 changed files with 54 additions and 61 deletions
|
@ -1038,8 +1038,8 @@ static void mos6522_q800_via1_init(Object *obj)
|
|||
sysbus_init_mmio(sbd, &v1s->via_mem);
|
||||
|
||||
/* ADB */
|
||||
qbus_create_inplace((BusState *)&v1s->adb_bus, sizeof(v1s->adb_bus),
|
||||
TYPE_ADB_BUS, DEVICE(v1s), "adb.0");
|
||||
qbus_init((BusState *)&v1s->adb_bus, sizeof(v1s->adb_bus),
|
||||
TYPE_ADB_BUS, DEVICE(v1s), "adb.0");
|
||||
|
||||
qdev_init_gpio_in(DEVICE(obj), via1_irq_request, VIA1_IRQ_NB);
|
||||
}
|
||||
|
|
|
@ -553,8 +553,8 @@ static void cuda_init(Object *obj)
|
|||
memory_region_init_io(&s->mem, obj, &mos6522_cuda_ops, s, "cuda", 0x2000);
|
||||
sysbus_init_mmio(sbd, &s->mem);
|
||||
|
||||
qbus_create_inplace(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS,
|
||||
DEVICE(obj), "adb.0");
|
||||
qbus_init(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS,
|
||||
DEVICE(obj), "adb.0");
|
||||
}
|
||||
|
||||
static Property cuda_properties[] = {
|
||||
|
|
|
@ -387,8 +387,8 @@ static void macio_instance_init(Object *obj)
|
|||
|
||||
memory_region_init(&s->bar, obj, "macio", 0x80000);
|
||||
|
||||
qbus_create_inplace(&s->macio_bus, sizeof(s->macio_bus), TYPE_MACIO_BUS,
|
||||
DEVICE(obj), "macio.0");
|
||||
qbus_init(&s->macio_bus, sizeof(s->macio_bus), TYPE_MACIO_BUS,
|
||||
DEVICE(obj), "macio.0");
|
||||
|
||||
object_initialize_child(OBJECT(s), "dbdma", &s->dbdma, TYPE_MAC_DBDMA);
|
||||
|
||||
|
|
|
@ -754,8 +754,8 @@ static void pmu_realize(DeviceState *dev, Error **errp)
|
|||
timer_mod(s->one_sec_timer, s->one_sec_target);
|
||||
|
||||
if (s->has_adb) {
|
||||
qbus_create_inplace(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS,
|
||||
dev, "adb.0");
|
||||
qbus_init(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS,
|
||||
dev, "adb.0");
|
||||
adb_register_autopoll_callback(adb_bus, pmu_adb_poll, s);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue