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

qdev: Convert uses of qdev_create() manually 



Same transformation as in the previous commit.  Manual, because
convincing Coccinelle to transform these cases is somewhere between
not worthwhile and infeasible (at least for me).

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-11-armbru@redhat.com>
parent 3e80f690

hw/arm/highbank.c

+13 −13
Original line number Diff line number Diff line
@@ -311,20 +311,20 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 


    switch (machine_id) {

    case CALXEDA_HIGHBANK:

        dev = qdev_create(NULL, "l2x0");

        qdev_init_nofail(dev);

        dev = qdev_new("l2x0");

        qdev_realize_and_unref(dev, NULL, &error_fatal);

        busdev = SYS_BUS_DEVICE(dev);

        sysbus_mmio_map(busdev, 0, 0xfff12000);



        dev = qdev_create(NULL, TYPE_A9MPCORE_PRIV);

        dev = qdev_new(TYPE_A9MPCORE_PRIV);

        break;

    case CALXEDA_MIDWAY:

        dev = qdev_create(NULL, TYPE_A15MPCORE_PRIV);

        dev = qdev_new(TYPE_A15MPCORE_PRIV);

        break;

    }

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

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

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);

    for (n = 0; n < smp_cpus; n++) {
@@ -338,17 +338,17 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        pic[n] = qdev_get_gpio_in(dev, n);

    }



    dev = qdev_create(NULL, "sp804");

    dev = qdev_new("sp804");

    qdev_prop_set_uint32(dev, "freq0", 150000000);

    qdev_prop_set_uint32(dev, "freq1", 150000000);

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(busdev, 0, 0xfff34000);

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

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



    dev = qdev_create(NULL, TYPE_HIGHBANK_REGISTERS);

    qdev_init_nofail(dev);

    dev = qdev_new(TYPE_HIGHBANK_REGISTERS);

    qdev_realize_and_unref(dev, NULL, &error_fatal);

    busdev = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(busdev, 0, 0xfff3c000);
@@ -363,18 +363,18 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 


    if (nd_table[0].used) {

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

        dev = qdev_create(NULL, "xgmac");

        dev = qdev_new("xgmac");

        qdev_set_nic_properties(dev, &nd_table[0]);

        qdev_init_nofail(dev);

        qdev_realize_and_unref(dev, NULL, &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]);

        sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, pic[79]);



        qemu_check_nic_model(&nd_table[1], "xgmac");

        dev = qdev_create(NULL, "xgmac");

        dev = qdev_new("xgmac");

        qdev_set_nic_properties(dev, &nd_table[1]);

        qdev_init_nofail(dev);

        qdev_realize_and_unref(dev, NULL, &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/sbsa-ref.c

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static PFlashCFI01 *sbsa_flash_create1(SBSAMachineState *sms, 
     * Create a single flash device.  We use the same parameters as

     * the flash devices on the Versatile Express board.

     */

    DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01);

    DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);



    qdev_prop_set_uint64(dev, "sector-length", SBSA_FLASH_SECTOR_SIZE);

    qdev_prop_set_uint8(dev, "width", 4);
@@ -243,7 +243,7 @@ static void sbsa_flash_map1(PFlashCFI01 *flash, 
    assert(QEMU_IS_ALIGNED(size, SBSA_FLASH_SECTOR_SIZE));

    assert(size / SBSA_FLASH_SECTOR_SIZE <= UINT32_MAX);

    qdev_prop_set_uint32(dev, "num-blocks", size / SBSA_FLASH_SECTOR_SIZE);

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);



    memory_region_add_subregion(sysmem, base,

                                sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),

hw/arm/virt.c

+2 −2
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ static PFlashCFI01 *virt_flash_create1(VirtMachineState *vms, 
     * Create a single flash device.  We use the same parameters as

     * the flash devices on the Versatile Express board.

     */

    DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01);

    DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);



    qdev_prop_set_uint64(dev, "sector-length", VIRT_FLASH_SECTOR_SIZE);

    qdev_prop_set_uint8(dev, "width", 4);
@@ -980,7 +980,7 @@ static void virt_flash_map1(PFlashCFI01 *flash, 
    assert(QEMU_IS_ALIGNED(size, VIRT_FLASH_SECTOR_SIZE));

    assert(size / VIRT_FLASH_SECTOR_SIZE <= UINT32_MAX);

    qdev_prop_set_uint32(dev, "num-blocks", size / VIRT_FLASH_SECTOR_SIZE);

    qdev_init_nofail(dev);

    qdev_realize_and_unref(dev, NULL, &error_fatal);



    memory_region_add_subregion(sysmem, base,

                                sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),

hw/block/xen-block.c

+2 −2
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ static void xen_block_device_create(XenBackendInstance *backend, 
        goto fail;

    }



    xendev = XEN_DEVICE(qdev_create(BUS(xenbus), type));

    xendev = XEN_DEVICE(qdev_new(type));

    blockdev = XEN_BLOCK_DEVICE(xendev);



    object_property_set_str(OBJECT(xendev), vdev, "vdev", &local_err);
@@ -965,7 +965,7 @@ static void xen_block_device_create(XenBackendInstance *backend, 
    blockdev->iothread = iothread;

    blockdev->drive = drive;



    object_property_set_bool(OBJECT(xendev), true, "realized", &local_err);

    qdev_realize_and_unref(DEVICE(xendev), BUS(xenbus), &local_err);

    if (local_err) {

        error_propagate_prepend(errp, local_err,

                                "realization of device %s failed: ",

hw/char/serial.c

+2 −2
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ SerialMM *serial_mm_init(MemoryRegion *address_space, 
                         qemu_irq irq, int baudbase,

                         Chardev *chr, enum device_endian end)

{

    SerialMM *smm = SERIAL_MM(qdev_create(NULL, TYPE_SERIAL_MM));

    SerialMM *smm = SERIAL_MM(qdev_new(TYPE_SERIAL_MM));

    MemoryRegion *mr;



    qdev_prop_set_uint8(DEVICE(smm), "regshift", regshift);
@@ -1135,7 +1135,7 @@ SerialMM *serial_mm_init(MemoryRegion *address_space, 
    qdev_prop_set_chr(DEVICE(smm), "chardev", chr);

    qdev_set_legacy_instance_id(DEVICE(smm), base, 2);

    qdev_prop_set_uint8(DEVICE(smm), "endianness", end);

    qdev_init_nofail(DEVICE(smm));

    qdev_realize_and_unref(DEVICE(smm), NULL, &error_fatal);



    sysbus_connect_irq(SYS_BUS_DEVICE(smm), 0, irq);

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(smm), 0);