Commit 3e80f690 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qdev: Convert uses of qdev_create() with Coccinelle 



This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion.  More to come in
this series.

Coccinelle script:

    @ depends on !(file in "hw/arm/highbank.c")@
    expression bus, type_name, dev, expr;
    @@
    -    dev = qdev_create(bus, type_name);
    +    dev = qdev_new(type_name);
         ... when != dev = expr
    -    qdev_init_nofail(dev);
    +    qdev_realize_and_unref(dev, bus, &error_fatal);

    @@
    expression bus, type_name, dev, expr;
    identifier DOWN;
    @@
    -    dev = DOWN(qdev_create(bus, type_name));
    +    dev = DOWN(qdev_new(type_name));
         ... when != dev = expr
    -    qdev_init_nofail(DEVICE(dev));
    +    qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);

    @@
    expression bus, type_name, expr;
    identifier dev;
    @@
    -    DeviceState *dev = qdev_create(bus, type_name);
    +    DeviceState *dev = qdev_new(type_name);
         ... when != dev = expr
    -    qdev_init_nofail(dev);
    +    qdev_realize_and_unref(dev, bus, &error_fatal);

    @@
    expression bus, type_name, dev, expr, errp;
    symbol true;
    @@
    -    dev = qdev_create(bus, type_name);
    +    dev = qdev_new(type_name);
         ... when != dev = expr
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize_and_unref(dev, bus, errp);

    @@
    expression bus, type_name, expr, errp;
    identifier dev;
    symbol true;
    @@
    -    DeviceState *dev = qdev_create(bus, type_name);
    +    DeviceState *dev = qdev_new(type_name);
         ... when != dev = expr
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize_and_unref(dev, bus, errp);

The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name.  Covered by the
next commit's manual conversions.

Missing #include "qapi/error.h" added manually.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
parent dc3edf8d

hw/alpha/typhoon.c

+2 −2
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, ISABus **isa_bus, qemu_irq *p_rtc_irq, 
    PCIBus *b;

    int i;



    dev = qdev_create(NULL, TYPE_TYPHOON_PCI_HOST_BRIDGE);

    dev = qdev_new(TYPE_TYPHOON_PCI_HOST_BRIDGE);



    s = TYPHOON_PCI_HOST_BRIDGE(dev);

    phb = PCI_HOST_BRIDGE(dev);
@@ -889,7 +889,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, ISABus **isa_bus, qemu_irq *p_rtc_irq, 
                              &s->pchip.reg_mem, &s->pchip.reg_io,

                              0, 64, TYPE_PCI_BUS);

    phb->bus = b;

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);



    /* Host memory as seen from the PCI side, via the IOMMU.  */

    memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu),

hw/arm/aspeed.c

+4 −3
Original line number Diff line number Diff line
@@ -241,13 +241,14 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo) 
{

        DeviceState *card;



        card = qdev_create(qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),

                           TYPE_SD_CARD);

        card = qdev_new(TYPE_SD_CARD);

        if (dinfo) {

            qdev_prop_set_drive(card, "drive", blk_by_legacy_dinfo(dinfo),

                                &error_fatal);

        }

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

        qdev_realize_and_unref(card,

                               qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),

                               &error_fatal);

}



static void aspeed_machine_init(MachineState *machine)

hw/arm/cubieboard.c

+2 −2
Original line number Diff line number Diff line
@@ -92,9 +92,9 @@ static void cubieboard_init(MachineState *machine) 
    bus = qdev_get_child_bus(DEVICE(a10), "sd-bus");



    /* Plug in SD card */

    carddev = qdev_create(bus, TYPE_SD_CARD);

    carddev = qdev_new(TYPE_SD_CARD);

    qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

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

    qdev_realize_and_unref(carddev, bus, &error_fatal);



    memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,

                                machine->ram);

hw/arm/exynos4210.c

+21 −20
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static DeviceState *pl330_create(uint32_t base, qemu_or_irq *orgate, 
    DeviceState *dev;

    int i;



    dev = qdev_create(NULL, "pl330");

    dev = qdev_new("pl330");

    qdev_prop_set_uint8(dev, "num_events", nevents);

    qdev_prop_set_uint8(dev, "num_chnls",  8);

    qdev_prop_set_uint8(dev, "num_periph_req",  nreq);
@@ -184,7 +184,7 @@ static DeviceState *pl330_create(uint32_t base, qemu_or_irq *orgate, 
    qdev_prop_set_uint8(dev, "rd_q_dep", 8);

    qdev_prop_set_uint8(dev, "data_width", width);

    qdev_prop_set_uint16(dev, "data_buffer_dep", width);

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(busdev, 0, base);
@@ -232,9 +232,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 


    /* IRQ Gate */

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

        dev = qdev_create(NULL, "exynos4210.irq_gate");

        dev = qdev_new("exynos4210.irq_gate");

        qdev_prop_set_uint32(dev, "n_in", EXYNOS4210_IRQ_GATE_NINPUTS);

        qdev_init_nofail(dev);

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        /* Get IRQ Gate input in gate_irq */

        for (n = 0; n < EXYNOS4210_IRQ_GATE_NINPUTS; n++) {

            gate_irq[i][n] = qdev_get_gpio_in(dev, n);
@@ -247,9 +247,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    }



    /* Private memory region and Internal GIC */

    dev = qdev_create(NULL, TYPE_A9MPCORE_PRIV);

    dev = qdev_new(TYPE_A9MPCORE_PRIV);

    qdev_prop_set_uint32(dev, "num-cpu", EXYNOS4210_NCPUS);

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(busdev, 0, EXYNOS4210_SMP_PRIVATE_BASE_ADDR);

    for (n = 0; n < EXYNOS4210_NCPUS; n++) {
@@ -263,9 +263,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    sysbus_create_simple("l2x0", EXYNOS4210_L2X0_BASE_ADDR, NULL);



    /* External GIC */

    dev = qdev_create(NULL, "exynos4210.gic");

    dev = qdev_new("exynos4210.gic");

    qdev_prop_set_uint32(dev, "num-cpu", EXYNOS4210_NCPUS);

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    /* Map CPU interface */

    sysbus_mmio_map(busdev, 0, EXYNOS4210_EXT_GIC_CPU_BASE_ADDR);
@@ -279,8 +279,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    }



    /* Internal Interrupt Combiner */

    dev = qdev_create(NULL, "exynos4210.combiner");

    qdev_init_nofail(dev);

    dev = qdev_new("exynos4210.combiner");

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    for (n = 0; n < EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ; n++) {

        sysbus_connect_irq(busdev, n, s->irqs.int_gic_irq[n]);
@@ -289,9 +289,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    sysbus_mmio_map(busdev, 0, EXYNOS4210_INT_COMBINER_BASE_ADDR);



    /* External Interrupt Combiner */

    dev = qdev_create(NULL, "exynos4210.combiner");

    dev = qdev_new("exynos4210.combiner");

    qdev_prop_set_uint32(dev, "external", 1);

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    for (n = 0; n < EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ; n++) {

        sysbus_connect_irq(busdev, n, s->irqs.ext_gic_irq[n]);
@@ -353,8 +353,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
                          NULL);



    /* Multi Core Timer */

    dev = qdev_create(NULL, "exynos4210.mct");

    qdev_init_nofail(dev);

    dev = qdev_new("exynos4210.mct");

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    for (n = 0; n < 4; n++) {

        /* Connect global timer interrupts to Combiner gpio_in */
@@ -379,8 +379,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
            i2c_irq = s->irq_table[exynos4210_get_irq(EXYNOS4210_HDMI_INTG, 1)];

        }



        dev = qdev_create(NULL, "exynos4210.i2c");

        qdev_init_nofail(dev);

        dev = qdev_new("exynos4210.i2c");

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        busdev = SYS_BUS_DEVICE(dev);

        sysbus_connect_irq(busdev, 0, i2c_irq);

        sysbus_mmio_map(busdev, 0, addr);
@@ -423,9 +423,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
         * public datasheet which is very similar (implementing

         * MMC Specification Version 4.0 being the only difference noted)

         */

        dev = qdev_create(NULL, TYPE_S3C_SDHCI);

        dev = qdev_new(TYPE_S3C_SDHCI);

        qdev_prop_set_uint64(dev, "capareg", EXYNOS4210_SDHCI_CAPABILITIES);

        qdev_init_nofail(dev);

        qdev_realize_and_unref(dev, NULL, &error_fatal);



        busdev = SYS_BUS_DEVICE(dev);

        sysbus_mmio_map(busdev, 0, EXYNOS4210_SDHCI_ADDR(n));
@@ -433,9 +433,10 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 


        di = drive_get(IF_SD, 0, n);

        blk = di ? blk_by_legacy_dinfo(di) : NULL;

        carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);

        carddev = qdev_new(TYPE_SD_CARD);

        qdev_prop_set_drive(carddev, "drive", blk, &error_abort);

        qdev_init_nofail(carddev);

        qdev_realize_and_unref(carddev, qdev_get_child_bus(dev, "sd-bus"),

                               &error_fatal);

    }



    /*** Display controller (FIMD) ***/

hw/arm/exynos4_boards.c

+2 −2
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
    /* This should be a 9215 but the 9118 is close enough */

    if (nd_table[0].used) {

        qemu_check_nic_model(&nd_table[0], "lan9118");

        dev = qdev_create(NULL, TYPE_LAN9118);

        dev = qdev_new(TYPE_LAN9118);

        qdev_set_nic_properties(dev, &nd_table[0]);

        qdev_prop_set_uint32(dev, "mode_16bit", 1);

        qdev_init_nofail(dev);

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        s = SYS_BUS_DEVICE(dev);

        sysbus_mmio_map(s, 0, base);

        sysbus_connect_irq(s, 0, irq);