Commit 0074fce6 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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



I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.

sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus().  It
passes no properties.

Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().

Coccinelle script:

    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, &child, size, type);
    +    sysbus_init_child_XXX(parent, name, &child, size, type);
         ...
    -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);

    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);

    @@
    expression parent, name, size, type;
    expression child;
    expression dev;
    expression expr;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
         dev = DEVICE(child);
         ... when != dev = expr;
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);

    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)

    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)

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-48-armbru@redhat.com>
parent cfe91404

hw/arm/bcm2835_peripherals.c

+2 −3
Original line number Diff line number Diff line
@@ -27,11 +27,10 @@ static void create_unimp(BCM2835PeripheralState *ps, 
                         UnimplementedDeviceState *uds,

                         const char *name, hwaddr ofs, hwaddr size)

{

    sysbus_init_child_obj(OBJECT(ps), name, uds, sizeof(*uds),

                          TYPE_UNIMPLEMENTED_DEVICE);

    object_initialize_child(OBJECT(ps), name, uds, TYPE_UNIMPLEMENTED_DEVICE);

    qdev_prop_set_string(DEVICE(uds), "name", name);

    qdev_prop_set_uint64(DEVICE(uds), "size", size);

    object_property_set_bool(OBJECT(uds), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(uds), &error_fatal);

    memory_region_add_subregion_overlap(&ps->peri_mr, ofs,

                    sysbus_mmio_get_region(SYS_BUS_DEVICE(uds), 0), -1000);

}

hw/arm/exynos4_boards.c

+3 −4
Original line number Diff line number Diff line
@@ -128,10 +128,9 @@ exynos4_boards_init_common(MachineState *machine, 
    exynos4_boards_init_ram(s, get_system_memory(),

                            exynos4_board_ram_size[board_type]);



    sysbus_init_child_obj(OBJECT(machine), "soc",

                          &s->soc, sizeof(s->soc), TYPE_EXYNOS4210_SOC);

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

                             &error_fatal);

    object_initialize_child(OBJECT(machine), "soc", &s->soc,

                            TYPE_EXYNOS4210_SOC);

    sysbus_realize(SYS_BUS_DEVICE(&s->soc), &error_fatal);



    return s;

}

hw/arm/mps2-tz.c

+22 −28
Original line number Diff line number Diff line
@@ -174,11 +174,10 @@ static MemoryRegion *make_unimp_dev(MPS2TZMachineState *mms, 
     */

    UnimplementedDeviceState *uds = opaque;



    sysbus_init_child_obj(OBJECT(mms), name, uds, sizeof(*uds),

                          TYPE_UNIMPLEMENTED_DEVICE);

    object_initialize_child(OBJECT(mms), name, uds, TYPE_UNIMPLEMENTED_DEVICE);

    qdev_prop_set_string(DEVICE(uds), "name", name);

    qdev_prop_set_uint64(DEVICE(uds), "size", size);

    object_property_set_bool(OBJECT(uds), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(uds), &error_fatal);

    return sysbus_mmio_get_region(SYS_BUS_DEVICE(uds), 0);

}
@@ -193,11 +192,10 @@ static MemoryRegion *make_uart(MPS2TZMachineState *mms, void *opaque, 
    SysBusDevice *s;

    DeviceState *orgate_dev = DEVICE(&mms->uart_irq_orgate);



    sysbus_init_child_obj(OBJECT(mms), name, uart, sizeof(*uart),

                          TYPE_CMSDK_APB_UART);

    object_initialize_child(OBJECT(mms), name, uart, TYPE_CMSDK_APB_UART);

    qdev_prop_set_chr(DEVICE(uart), "chardev", serial_hd(i));

    qdev_prop_set_uint32(DEVICE(uart), "pclk-frq", SYSCLK_FRQ);

    object_property_set_bool(OBJECT(uart), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(uart), &error_fatal);

    s = SYS_BUS_DEVICE(uart);

    sysbus_connect_irq(s, 0, get_sse_irq_in(mms, txirqno));

    sysbus_connect_irq(s, 1, get_sse_irq_in(mms, rxirqno));
@@ -214,13 +212,12 @@ static MemoryRegion *make_scc(MPS2TZMachineState *mms, void *opaque, 
    DeviceState *sccdev;

    MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms);



    sysbus_init_child_obj(OBJECT(mms), "scc", scc, sizeof(*scc),

                          TYPE_MPS2_SCC);

    object_initialize_child(OBJECT(mms), "scc", scc, TYPE_MPS2_SCC);

    sccdev = DEVICE(scc);

    qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2);

    qdev_prop_set_uint32(sccdev, "scc-aid", 0x00200008);

    qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id);

    object_property_set_bool(OBJECT(scc), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(scc), &error_fatal);

    return sysbus_mmio_get_region(SYS_BUS_DEVICE(sccdev), 0);

}
@@ -229,9 +226,8 @@ static MemoryRegion *make_fpgaio(MPS2TZMachineState *mms, void *opaque, 
{

    MPS2FPGAIO *fpgaio = opaque;



    sysbus_init_child_obj(OBJECT(mms), "fpgaio", fpgaio, sizeof(*fpgaio),

                          TYPE_MPS2_FPGAIO);

    object_property_set_bool(OBJECT(fpgaio), true, "realized", &error_fatal);

    object_initialize_child(OBJECT(mms), "fpgaio", fpgaio, TYPE_MPS2_FPGAIO);

    sysbus_realize(SYS_BUS_DEVICE(fpgaio), &error_fatal);

    return sysbus_mmio_get_region(SYS_BUS_DEVICE(fpgaio), 0);

}
@@ -267,11 +263,10 @@ static MemoryRegion *make_mpc(MPS2TZMachineState *mms, void *opaque, 


    memory_region_init_ram(ssram, NULL, name, ramsize[i], &error_fatal);



    sysbus_init_child_obj(OBJECT(mms), mpcname, mpc, sizeof(*mpc),

                          TYPE_TZ_MPC);

    object_initialize_child(OBJECT(mms), mpcname, mpc, TYPE_TZ_MPC);

    object_property_set_link(OBJECT(mpc), OBJECT(ssram),

                             "downstream", &error_fatal);

    object_property_set_bool(OBJECT(mpc), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(mpc), &error_fatal);

    /* Map the upstream end of the MPC into system memory */

    upstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(mpc), 1);

    memory_region_add_subregion(get_system_memory(), rambase[i], upstream);
@@ -310,13 +305,13 @@ static MemoryRegion *make_dma(MPS2TZMachineState *mms, void *opaque, 
     * the MSC connects to the IoTKit AHB Slave Expansion port, so the

     * DMA devices can see all devices and memory that the CPU does.

     */

    sysbus_init_child_obj(OBJECT(mms), mscname, msc, sizeof(*msc), TYPE_TZ_MSC);

    object_initialize_child(OBJECT(mms), mscname, msc, TYPE_TZ_MSC);

    msc_downstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(&mms->iotkit), 0);

    object_property_set_link(OBJECT(msc), OBJECT(msc_downstream),

                             "downstream", &error_fatal);

    object_property_set_link(OBJECT(msc), OBJECT(mms),

                             "idau", &error_fatal);

    object_property_set_bool(OBJECT(msc), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(msc), &error_fatal);



    qdev_connect_gpio_out_named(DEVICE(msc), "irq", 0,

                                qdev_get_gpio_in_named(iotkitdev,
@@ -333,10 +328,10 @@ static MemoryRegion *make_dma(MPS2TZMachineState *mms, void *opaque, 
                                                 "cfg_sec_resp", 0));

    msc_upstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(msc), 0);



    sysbus_init_child_obj(OBJECT(mms), name, dma, sizeof(*dma), TYPE_PL081);

    object_initialize_child(OBJECT(mms), name, dma, TYPE_PL081);

    object_property_set_link(OBJECT(dma), OBJECT(msc_upstream),

                             "downstream", &error_fatal);

    object_property_set_bool(OBJECT(dma), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(dma), &error_fatal);



    s = SYS_BUS_DEVICE(dma);

    /* Wire up DMACINTR, DMACINTERR, DMACINTTC */
@@ -363,8 +358,8 @@ static MemoryRegion *make_spi(MPS2TZMachineState *mms, void *opaque, 
    int i = spi - &mms->spi[0];

    SysBusDevice *s;



    sysbus_init_child_obj(OBJECT(mms), name, spi, sizeof(*spi), TYPE_PL022);

    object_property_set_bool(OBJECT(spi), true, "realized", &error_fatal);

    object_initialize_child(OBJECT(mms), name, spi, TYPE_PL022);

    sysbus_realize(SYS_BUS_DEVICE(spi), &error_fatal);

    s = SYS_BUS_DEVICE(spi);

    sysbus_connect_irq(s, 0, get_sse_irq_in(mms, 51 + i));

    return sysbus_mmio_get_region(s, 0);
@@ -393,15 +388,14 @@ static void mps2tz_common_init(MachineState *machine) 
        exit(EXIT_FAILURE);

    }



    sysbus_init_child_obj(OBJECT(machine), TYPE_IOTKIT, &mms->iotkit,

                          sizeof(mms->iotkit), mmc->armsse_type);

    object_initialize_child(OBJECT(machine), TYPE_IOTKIT, &mms->iotkit,

                            mmc->armsse_type);

    iotkitdev = DEVICE(&mms->iotkit);

    object_property_set_link(OBJECT(&mms->iotkit), OBJECT(system_memory),

                             "memory", &error_abort);

    qdev_prop_set_uint32(iotkitdev, "EXP_NUMIRQ", MPS2TZ_NUMIRQ);

    qdev_prop_set_uint32(iotkitdev, "MAINCLK", SYSCLK_FRQ);

    object_property_set_bool(OBJECT(&mms->iotkit), true, "realized",

                             &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(&mms->iotkit), &error_fatal);



    /*

     * The AN521 needs us to create splitters to feed the IRQ inputs
@@ -549,8 +543,8 @@ static void mps2tz_common_init(MachineState *machine) 
        int port;

        char *gpioname;



        sysbus_init_child_obj(OBJECT(machine), ppcinfo->name, ppc,

                              sizeof(*ppc), TYPE_TZ_PPC);

        object_initialize_child(OBJECT(machine), ppcinfo->name, ppc,

                                TYPE_TZ_PPC);

        ppcdev = DEVICE(ppc);



        for (port = 0; port < TZ_NUM_PORTS; port++) {
@@ -569,7 +563,7 @@ static void mps2tz_common_init(MachineState *machine) 
            g_free(portname);

        }



        object_property_set_bool(OBJECT(ppc), true, "realized", &error_fatal);

        sysbus_realize(SYS_BUS_DEVICE(ppc), &error_fatal);



        for (port = 0; port < TZ_NUM_PORTS; port++) {

            const PPCPortInfo *pinfo = &ppcinfo->ports[port];

hw/arm/mps2.c

+7 −12
Original line number Diff line number Diff line
@@ -180,8 +180,7 @@ static void mps2_common_init(MachineState *machine) 
        g_assert_not_reached();

    }



    sysbus_init_child_obj(OBJECT(mms), "armv7m", &mms->armv7m,

                          sizeof(mms->armv7m), TYPE_ARMV7M);

    object_initialize_child(OBJECT(mms), "armv7m", &mms->armv7m, TYPE_ARMV7M);

    armv7m = DEVICE(&mms->armv7m);

    switch (mmc->fpga_type) {

    case FPGA_AN385:
@@ -197,8 +196,7 @@ static void mps2_common_init(MachineState *machine) 
    qdev_prop_set_bit(armv7m, "enable-bitband", true);

    object_property_set_link(OBJECT(&mms->armv7m), OBJECT(system_memory),

                             "memory", &error_abort);

    object_property_set_bool(OBJECT(&mms->armv7m), true, "realized",

                             &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(&mms->armv7m), &error_fatal);



    create_unimplemented_device("zbtsmram mirror", 0x00400000, 0x00400000);

    create_unimplemented_device("RESERVED 1", 0x00800000, 0x00800000);
@@ -305,23 +303,20 @@ static void mps2_common_init(MachineState *machine) 
    cmsdk_apb_timer_create(0x40000000, qdev_get_gpio_in(armv7m, 8), SYSCLK_FRQ);

    cmsdk_apb_timer_create(0x40001000, qdev_get_gpio_in(armv7m, 9), SYSCLK_FRQ);



    sysbus_init_child_obj(OBJECT(mms), "dualtimer", &mms->dualtimer,

                          sizeof(mms->dualtimer), TYPE_CMSDK_APB_DUALTIMER);

    object_initialize_child(OBJECT(mms), "dualtimer", &mms->dualtimer,

                            TYPE_CMSDK_APB_DUALTIMER);

    qdev_prop_set_uint32(DEVICE(&mms->dualtimer), "pclk-frq", SYSCLK_FRQ);

    object_property_set_bool(OBJECT(&mms->dualtimer), true, "realized",

                             &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(&mms->dualtimer), &error_fatal);

    sysbus_connect_irq(SYS_BUS_DEVICE(&mms->dualtimer), 0,

                       qdev_get_gpio_in(armv7m, 10));

    sysbus_mmio_map(SYS_BUS_DEVICE(&mms->dualtimer), 0, 0x40002000);



    sysbus_init_child_obj(OBJECT(mms), "scc", &mms->scc,

                          sizeof(mms->scc), TYPE_MPS2_SCC);

    object_initialize_child(OBJECT(mms), "scc", &mms->scc, TYPE_MPS2_SCC);

    sccdev = DEVICE(&mms->scc);

    qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2);

    qdev_prop_set_uint32(sccdev, "scc-aid", 0x00200008);

    qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id);

    object_property_set_bool(OBJECT(&mms->scc), true, "realized",

                             &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(&mms->scc), &error_fatal);

    sysbus_mmio_map(SYS_BUS_DEVICE(sccdev), 0, 0x4002f000);



    /* In hardware this is a LAN9220; the LAN9118 is software compatible

hw/arm/musca.c

+17 −20
Original line number Diff line number Diff line
@@ -142,11 +142,10 @@ static MemoryRegion *make_unimp_dev(MuscaMachineState *mms, 
     */

    UnimplementedDeviceState *uds = opaque;



    sysbus_init_child_obj(OBJECT(mms), name, uds, sizeof(*uds),

                          TYPE_UNIMPLEMENTED_DEVICE);

    object_initialize_child(OBJECT(mms), name, uds, TYPE_UNIMPLEMENTED_DEVICE);

    qdev_prop_set_string(DEVICE(uds), "name", name);

    qdev_prop_set_uint64(DEVICE(uds), "size", size);

    object_property_set_bool(OBJECT(uds), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(uds), &error_fatal);

    return sysbus_mmio_get_region(SYS_BUS_DEVICE(uds), 0);

}
@@ -245,22 +244,21 @@ static MemoryRegion *make_mpc(MuscaMachineState *mms, void *opaque, 
    case MPC_CRYPTOISLAND:

        /* We don't implement the CryptoIsland yet */

        uds = &mms->cryptoisland;

        sysbus_init_child_obj(OBJECT(mms), name, uds, sizeof(*uds),

        object_initialize_child(OBJECT(mms), name, uds,

                                TYPE_UNIMPLEMENTED_DEVICE);

        qdev_prop_set_string(DEVICE(uds), "name", mpcinfo[i].name);

        qdev_prop_set_uint64(DEVICE(uds), "size", mpcinfo[i].size);

        object_property_set_bool(OBJECT(uds), true, "realized", &error_fatal);

        sysbus_realize(SYS_BUS_DEVICE(uds), &error_fatal);

        downstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(uds), 0);

        break;

    default:

        g_assert_not_reached();

    }



    sysbus_init_child_obj(OBJECT(mms), mpcname, mpc, sizeof(*mpc),

                          TYPE_TZ_MPC);

    object_initialize_child(OBJECT(mms), mpcname, mpc, TYPE_TZ_MPC);

    object_property_set_link(OBJECT(mpc), OBJECT(downstream),

                             "downstream", &error_fatal);

    object_property_set_bool(OBJECT(mpc), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(mpc), &error_fatal);

    /* Map the upstream end of the MPC into system memory */

    upstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(mpc), 1);

    memory_region_add_subregion(get_system_memory(), mpcinfo[i].addr, upstream);
@@ -279,8 +277,8 @@ static MemoryRegion *make_rtc(MuscaMachineState *mms, void *opaque, 
{

    PL031State *rtc = opaque;



    sysbus_init_child_obj(OBJECT(mms), name, rtc, sizeof(*rtc), TYPE_PL031);

    object_property_set_bool(OBJECT(rtc), true, "realized", &error_fatal);

    object_initialize_child(OBJECT(mms), name, rtc, TYPE_PL031);

    sysbus_realize(SYS_BUS_DEVICE(rtc), &error_fatal);

    sysbus_connect_irq(SYS_BUS_DEVICE(rtc), 0, get_sse_irq_in(mms, 39));

    return sysbus_mmio_get_region(SYS_BUS_DEVICE(rtc), 0);

}
@@ -293,9 +291,9 @@ static MemoryRegion *make_uart(MuscaMachineState *mms, void *opaque, 
    int irqbase = 7 + i * 6;

    SysBusDevice *s;



    sysbus_init_child_obj(OBJECT(mms), name, uart, sizeof(*uart), TYPE_PL011);

    object_initialize_child(OBJECT(mms), name, uart, TYPE_PL011);

    qdev_prop_set_chr(DEVICE(uart), "chardev", serial_hd(i));

    object_property_set_bool(OBJECT(uart), true, "realized", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(uart), &error_fatal);

    s = SYS_BUS_DEVICE(uart);

    sysbus_connect_irq(s, 0, get_sse_irq_in(mms, irqbase + 5)); /* combined */

    sysbus_connect_irq(s, 1, get_sse_irq_in(mms, irqbase + 0)); /* RX */
@@ -373,8 +371,8 @@ static void musca_init(MachineState *machine) 
        exit(1);

    }



    sysbus_init_child_obj(OBJECT(machine), "sse-200", &mms->sse,

                          sizeof(mms->sse), TYPE_SSE200);

    object_initialize_child(OBJECT(machine), "sse-200", &mms->sse,

                            TYPE_SSE200);

    ssedev = DEVICE(&mms->sse);

    object_property_set_link(OBJECT(&mms->sse), OBJECT(system_memory),

                             "memory", &error_fatal);
@@ -390,8 +388,7 @@ static void musca_init(MachineState *machine) 
        qdev_prop_set_bit(ssedev, "CPU0_FPU", true);

        qdev_prop_set_bit(ssedev, "CPU0_DSP", true);

    }

    object_property_set_bool(OBJECT(&mms->sse), true, "realized",

                             &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(&mms->sse), &error_fatal);



    /*

     * We need to create splitters to feed the IRQ inputs
@@ -531,8 +528,8 @@ static void musca_init(MachineState *machine) 
        int port;

        char *gpioname;



        sysbus_init_child_obj(OBJECT(machine), ppcinfo->name, ppc,

                              sizeof(*ppc), TYPE_TZ_PPC);

        object_initialize_child(OBJECT(machine), ppcinfo->name, ppc,

                                TYPE_TZ_PPC);

        ppcdev = DEVICE(ppc);



        for (port = 0; port < TZ_NUM_PORTS; port++) {
@@ -551,7 +548,7 @@ static void musca_init(MachineState *machine) 
            g_free(portname);

        }



        object_property_set_bool(OBJECT(ppc), true, "realized", &error_fatal);

        sysbus_realize(SYS_BUS_DEVICE(ppc), &error_fatal);



        for (port = 0; port < TZ_NUM_PORTS; port++) {

            const PPCPortInfo *pinfo = &ppcinfo->ports[port];