mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 18:44:58 -06:00
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3
These are init/realize pairs produced by the previous commit's Coccinelle script where the argument test doesn't quite match. They need even more careful review. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200610053247.1583243-50-armbru@redhat.com>
This commit is contained in:
parent
db873cc5d1
commit
5a147c8c51
8 changed files with 35 additions and 44 deletions
|
@ -2640,8 +2640,7 @@ static void armv7m_nvic_realize(DeviceState *dev, Error **errp)
|
|||
|
||||
s->num_prio_bits = arm_feature(&s->cpu->env, ARM_FEATURE_V7) ? 8 : 2;
|
||||
|
||||
object_property_set_bool(OBJECT(&s->systick[M_REG_NS]), true,
|
||||
"realized", &err);
|
||||
sysbus_realize(SYS_BUS_DEVICE(&s->systick[M_REG_NS]), &err);
|
||||
if (err != NULL) {
|
||||
error_propagate(errp, err);
|
||||
return;
|
||||
|
@ -2735,8 +2734,8 @@ static void armv7m_nvic_instance_init(Object *obj)
|
|||
NVICState *nvic = NVIC(obj);
|
||||
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
||||
|
||||
sysbus_init_child_obj(obj, "systick-reg-ns", &nvic->systick[M_REG_NS],
|
||||
sizeof(nvic->systick[M_REG_NS]), TYPE_SYSTICK);
|
||||
object_initialize_child(obj, "systick-reg-ns", &nvic->systick[M_REG_NS],
|
||||
TYPE_SYSTICK);
|
||||
/* We can't initialize the secure systick here, as we don't know
|
||||
* yet if we need it.
|
||||
*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue