Commit 7089e0cc authored by Markus Armbruster's avatar Markus Armbruster
Browse files

sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4 



This is still the same transformation as in the previous commits, but
here the sysbus_init_child_obj() and its matching realize in are in
separate files.  Fortunately, there's just one realize left to
convert.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-51-armbru@redhat.com>
parent 5a147c8c

hw/arm/aspeed_ast2600.c

+4 −6
Original line number Diff line number Diff line
@@ -200,9 +200,8 @@ static void aspeed_soc_ast2600_init(Object *obj) 


    /* Init sd card slot class here so that they're under the correct parent */

    for (i = 0; i < ASPEED_SDHCI_NUM_SLOTS; ++i) {

        sysbus_init_child_obj(obj, "sd-controller.sdhci[*]",

                              &s->sdhci.slots[i],

                              sizeof(s->sdhci.slots[i]), TYPE_SYSBUS_SDHCI);

        object_initialize_child(obj, "sd-controller.sdhci[*]",

                                &s->sdhci.slots[i], TYPE_SYSBUS_SDHCI);

    }



    object_initialize_child(obj, "emmc-controller", &s->emmc,
@@ -210,8 +209,7 @@ static void aspeed_soc_ast2600_init(Object *obj) 


    object_property_set_int(OBJECT(&s->emmc), 1, "num-slots", &error_abort);



    sysbus_init_child_obj(obj, "emmc-controller.sdhci",

                          &s->emmc.slots[0], sizeof(s->emmc.slots[0]),

    object_initialize_child(obj, "emmc-controller.sdhci", &s->emmc.slots[0],

                            TYPE_SYSBUS_SDHCI);

}

hw/arm/aspeed_soc.c

+2 −2
Original line number Diff line number Diff line
@@ -208,8 +208,8 @@ static void aspeed_soc_init(Object *obj) 


    /* Init sd card slot class here so that they're under the correct parent */

    for (i = 0; i < ASPEED_SDHCI_NUM_SLOTS; ++i) {

        sysbus_init_child_obj(obj, "sdhci[*]", &s->sdhci.slots[i],

                              sizeof(s->sdhci.slots[i]), TYPE_SYSBUS_SDHCI);

        object_initialize_child(obj, "sdhci[*]", &s->sdhci.slots[i],

                                TYPE_SYSBUS_SDHCI);

    }

}

hw/sd/aspeed_sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void aspeed_sdhci_realize(DeviceState *dev, Error **errp) 
            return;

        }



        object_property_set_bool(sdhci_slot, true, "realized", &err);

        sysbus_realize(sbd_slot, &err);

        if (err) {

            error_propagate(errp, err);

            return;