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

sysbus: Convert to sysbus_realize() etc. with Coccinelle 



Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().

Coccinelle script:

    @@
    expression dev, errp;
    @@
    -    qdev_realize(DEVICE(dev), NULL, errp);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), errp);

    @@
    expression sysbus_dev, dev, errp;
    @@
    +    sysbus_dev = SYS_BUS_DEVICE(dev);
    -    qdev_realize_and_unref(dev, NULL, errp);
    +    sysbus_realize_and_unref(sysbus_dev, errp);
    -    sysbus_dev = SYS_BUS_DEVICE(dev);

    @@
    expression sysbus_dev, dev, errp;
    expression expr;
    @@
         sysbus_dev = SYS_BUS_DEVICE(dev);
         ... when != dev = expr;
    -    qdev_realize_and_unref(dev, NULL, errp);
    +    sysbus_realize_and_unref(sysbus_dev, errp);

    @@
    expression dev, errp;
    @@
    -    qdev_realize_and_unref(DEVICE(dev), NULL, errp);
    +    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);

    @@
    expression dev, errp;
    @@
    -    qdev_realize_and_unref(dev, NULL, errp);
    +    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);

Whitespace changes minimized manually.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Acked-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
parent 496a8525

hw/alpha/typhoon.c

+1 −1
Original line number Diff line number Diff line
@@ -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_realize_and_unref(dev, NULL, &error_fatal);

    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &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/exynos4210.c

+9 −9
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ 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_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

    sysbus_mmio_map(busdev, 0, base);



    object_property_set_int(OBJECT(orgate), nevents + 1, "num-lines",
@@ -234,7 +234,7 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    for (i = 0; i < EXYNOS4210_NCPUS; i++) {

        dev = qdev_new("exynos4210.irq_gate");

        qdev_prop_set_uint32(dev, "n_in", EXYNOS4210_IRQ_GATE_NINPUTS);

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &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);
@@ -249,8 +249,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    /* Private memory region and Internal GIC */

    dev = qdev_new(TYPE_A9MPCORE_PRIV);

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

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

    sysbus_mmio_map(busdev, 0, EXYNOS4210_SMP_PRIVATE_BASE_ADDR);

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

        sysbus_connect_irq(busdev, n, gate_irq[n][0]);
@@ -265,8 +265,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    /* External GIC */

    dev = qdev_new("exynos4210.gic");

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

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

    /* Map CPU interface */

    sysbus_mmio_map(busdev, 0, EXYNOS4210_EXT_GIC_CPU_BASE_ADDR);

    /* Map Distributer interface */
@@ -280,8 +280,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 


    /* Internal Interrupt Combiner */

    dev = qdev_new("exynos4210.combiner");

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

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

        sysbus_connect_irq(busdev, n, s->irqs.int_gic_irq[n]);

    }
@@ -291,8 +291,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
    /* External Interrupt Combiner */

    dev = qdev_new("exynos4210.combiner");

    qdev_prop_set_uint32(dev, "external", 1);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

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

        sysbus_connect_irq(busdev, n, s->irqs.ext_gic_irq[n]);

    }
@@ -354,8 +354,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 


    /* Multi Core Timer */

    dev = qdev_new("exynos4210.mct");

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

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

        /* Connect global timer interrupts to Combiner gpio_in */

        sysbus_connect_irq(busdev, n,
@@ -380,8 +380,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
        }



        dev = qdev_new("exynos4210.i2c");

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        busdev = SYS_BUS_DEVICE(dev);

        sysbus_realize_and_unref(busdev, &error_fatal);

        sysbus_connect_irq(busdev, 0, i2c_irq);

        sysbus_mmio_map(busdev, 0, addr);

        s->i2c_if[n] = (I2CBus *)qdev_get_child_bus(dev, "i2c");
@@ -425,9 +425,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) 
         */

        dev = qdev_new(TYPE_S3C_SDHCI);

        qdev_prop_set_uint64(dev, "capareg", EXYNOS4210_SDHCI_CAPABILITIES);

        qdev_realize_and_unref(dev, NULL, &error_fatal);



        busdev = SYS_BUS_DEVICE(dev);

        sysbus_realize_and_unref(busdev, &error_fatal);

        sysbus_mmio_map(busdev, 0, EXYNOS4210_SDHCI_ADDR(n));

        sysbus_connect_irq(busdev, 0, s->irq_table[exynos4210_get_irq(29, n)]);

hw/arm/exynos4_boards.c

+1 −1
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
        dev = qdev_new(TYPE_LAN9118);

        qdev_set_nic_properties(dev, &nd_table[0]);

        qdev_prop_set_uint32(dev, "mode_16bit", 1);

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        s = SYS_BUS_DEVICE(dev);

        sysbus_realize_and_unref(s, &error_fatal);

        sysbus_mmio_map(s, 0, base);

        sysbus_connect_irq(s, 0, irq);

    }

hw/arm/highbank.c

+6 −6
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    switch (machine_id) {

    case CALXEDA_HIGHBANK:

        dev = qdev_new("l2x0");

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        busdev = SYS_BUS_DEVICE(dev);

        sysbus_realize_and_unref(busdev, &error_fatal);

        sysbus_mmio_map(busdev, 0, 0xfff12000);



        dev = qdev_new(TYPE_A9MPCORE_PRIV);
@@ -324,8 +324,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    }

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

    qdev_prop_set_uint32(dev, "num-irq", NIRQ_GIC);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

    sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);

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

        sysbus_connect_irq(busdev, n, cpu_irq[n]);
@@ -341,15 +341,15 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    dev = qdev_new("sp804");

    qdev_prop_set_uint32(dev, "freq0", 150000000);

    qdev_prop_set_uint32(dev, "freq1", 150000000);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

    sysbus_mmio_map(busdev, 0, 0xfff34000);

    sysbus_connect_irq(busdev, 0, pic[18]);

    pl011_create(0xfff36000, pic[20], serial_hd(0));



    dev = qdev_new(TYPE_HIGHBANK_REGISTERS);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_realize_and_unref(busdev, &error_fatal);

    sysbus_mmio_map(busdev, 0, 0xfff3c000);



    sysbus_create_simple("pl061", 0xfff30000, pic[14]);
@@ -365,7 +365,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        qemu_check_nic_model(&nd_table[0], "xgmac");

        dev = qdev_new("xgmac");

        qdev_set_nic_properties(dev, &nd_table[0]);

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

        sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff50000);

        sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[77]);

        sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, pic[78]);
@@ -374,7 +374,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        qemu_check_nic_model(&nd_table[1], "xgmac");

        dev = qdev_new("xgmac");

        qdev_set_nic_properties(dev, &nd_table[1]);

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

        sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff51000);

        sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[80]);

        sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, pic[81]);

hw/arm/integratorcp.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static void integratorcp_init(MachineState *machine) 


    dev = qdev_new(TYPE_INTEGRATOR_CM);

    qdev_prop_set_uint32(dev, "memsz", ram_size >> 20);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

    sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000);



    dev = sysbus_create_varargs(TYPE_INTEGRATOR_PIC, 0x14000000,