|
@@ -121,19 +121,17 @@ static void mpcore_priv_initfn(Object *obj)
|
|
|
"mpcore-priv-container", 0x2000);
|
|
|
sysbus_init_mmio(sbd, &s->container);
|
|
|
|
|
|
- object_initialize(&s->scu, sizeof(s->scu), TYPE_ARM11_SCU);
|
|
|
- qdev_set_parent_bus(DEVICE(&s->scu), sysbus_get_default());
|
|
|
+ sysbus_init_child_obj(obj, "scu", &s->scu, sizeof(s->scu), TYPE_ARM11_SCU);
|
|
|
|
|
|
- object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC);
|
|
|
- qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default());
|
|
|
+ sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic), TYPE_ARM_GIC);
|
|
|
/* Request the legacy 11MPCore GIC behaviour: */
|
|
|
qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 0);
|
|
|
|
|
|
- object_initialize(&s->mptimer, sizeof(s->mptimer), TYPE_ARM_MPTIMER);
|
|
|
- qdev_set_parent_bus(DEVICE(&s->mptimer), sysbus_get_default());
|
|
|
+ sysbus_init_child_obj(obj, "mptimer", &s->mptimer, sizeof(s->mptimer),
|
|
|
+ TYPE_ARM_MPTIMER);
|
|
|
|
|
|
- object_initialize(&s->wdtimer, sizeof(s->wdtimer), TYPE_ARM_MPTIMER);
|
|
|
- qdev_set_parent_bus(DEVICE(&s->wdtimer), sysbus_get_default());
|
|
|
+ sysbus_init_child_obj(obj, "wdtimer", &s->wdtimer, sizeof(s->wdtimer),
|
|
|
+ TYPE_ARM_MPTIMER);
|
|
|
}
|
|
|
|
|
|
static Property mpcore_priv_properties[] = {
|