Commit ce189ab2 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qdev: Convert bus-less devices to qdev_realize() with Coccinelle 



All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:

    // only correct for bus-less @dev!

    @@
    expression errp;
    expression dev;
    @@
    -    qdev_init_nofail(dev);
    +    qdev_realize(dev, NULL, &error_fatal);

    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);

    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(dev, true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);

Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Acked-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
parent 464a22c7

hw/arm/allwinner-a10.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
    SysBusDevice *sysbusdev;

    Error *err = NULL;



    object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);

    qdev_realize(DEVICE(&s->cpu), NULL, &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;

hw/arm/allwinner-h3.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) 
        qdev_prop_set_bit(DEVICE(&s->cpus[i]), "has_el2", true);



        /* Mark realized */

        qdev_init_nofail(DEVICE(&s->cpus[i]));

        qdev_realize(DEVICE(&s->cpus[i]), NULL, &error_fatal);

    }



    /* Generic Interrupt Controller */

hw/arm/armsse.c

+8 −12
Original line number Diff line number Diff line
@@ -584,8 +584,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
         * CPU must exist and have been parented into the cluster before

         * the cluster is realized.

         */

        object_property_set_bool(OBJECT(&s->cluster[i]),

                                 true, "realized", &err);

        qdev_realize(DEVICE(&s->cluster[i]), NULL, &err);

        if (err) {

            error_propagate(errp, err);

            return;
@@ -621,7 +620,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
                    error_propagate(errp, err);

                    return;

                }

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

                qdev_realize(DEVICE(splitter), NULL, &err);

                if (err) {

                    error_propagate(errp, err);

                    return;
@@ -677,8 +676,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
        error_propagate(errp, err);

        return;

    }

    object_property_set_bool(OBJECT(&s->sec_resp_splitter), true,

                             "realized", &err);

    qdev_realize(DEVICE(&s->sec_resp_splitter), NULL, &err);

    if (err) {

        error_propagate(errp, err);

        return;
@@ -729,8 +727,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
        error_propagate(errp, err);

        return;

    }

    object_property_set_bool(OBJECT(&s->mpc_irq_orgate), true,

                             "realized", &err);

    qdev_realize(DEVICE(&s->mpc_irq_orgate), NULL, &err);

    if (err) {

        error_propagate(errp, err);

        return;
@@ -889,8 +886,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
        error_propagate(errp, err);

        return;

    }

    object_property_set_bool(OBJECT(&s->ppc_irq_orgate), true,

                             "realized", &err);

    qdev_realize(DEVICE(&s->ppc_irq_orgate), NULL, &err);

    if (err) {

        error_propagate(errp, err);

        return;
@@ -1065,7 +1061,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
        error_propagate(errp, err);

        return;

    }

    object_property_set_bool(OBJECT(&s->nmi_orgate), true, "realized", &err);

    qdev_realize(DEVICE(&s->nmi_orgate), NULL, &err);

    if (err) {

        error_propagate(errp, err);

        return;
@@ -1113,7 +1109,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
            error_propagate(errp, err);

            return;

        }

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

        qdev_realize(DEVICE(splitter), NULL, &err);

        if (err) {

            error_propagate(errp, err);

            return;
@@ -1160,7 +1156,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
            error_propagate(errp, err);

            return;

        }

        object_property_set_bool(OBJECT(splitter), true, "realized", &err);

        qdev_realize(DEVICE(splitter), NULL, &err);

        if (err) {

            error_propagate(errp, err);

            return;

hw/arm/armv7m.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 
    s->cpu->env.nvic = &s->nvic;

    s->nvic.cpu = s->cpu;



    object_property_set_bool(OBJECT(s->cpu), true, "realized", &err);

    qdev_realize(DEVICE(s->cpu), NULL, &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;

hw/arm/aspeed.c

+1 −2
Original line number Diff line number Diff line
@@ -302,8 +302,7 @@ static void aspeed_machine_init(MachineState *machine) 
        object_property_set_int(OBJECT(&bmc->soc), ASPEED_SCU_PROT_KEY,

                                "hw-prot-key", &error_abort);

    }

    object_property_set_bool(OBJECT(&bmc->soc), true, "realized",

                             &error_abort);

    qdev_realize(DEVICE(&bmc->soc), NULL, &error_abort);



    memory_region_add_subregion(get_system_memory(),

                                sc->memmap[ASPEED_SDRAM],