Commit 9307d06d authored by Markus Armbruster's avatar Markus Armbruster
Browse files

pci: Convert uses of pci_create() etc. with Coccinelle 



Replace

    dev = pci_create(bus, type_name);
    ...
    qdev_init_nofail(dev);

by

    dev = pci_new(type_name);
    ...
    pci_realize_and_unref(dev, bus, &error_fatal);

and similarly for pci_create_multifunction().

Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.

Coccinelle script:

    @@
    expression dev, bus, expr;
    expression list args;
    @@
    -    dev = pci_create(bus, args);
    +    dev = pci_new(args);
         ... when != dev = expr
    -    qdev_init_nofail(&dev->qdev);
    +    pci_realize_and_unref(dev, bus, &error_fatal);

    @@
    expression dev, bus, expr;
    expression list args;
    expression d;
    @@
    -    dev = pci_create(bus, args);
    +    dev = pci_new(args);
    (
         d = &dev->qdev;
    |
         d = DEVICE(dev);
    )
         ... when != dev = expr
    -    qdev_init_nofail(d);
    +    pci_realize_and_unref(dev, bus, &error_fatal);

    @@
    expression dev, bus, expr;
    expression list args;
    @@
    -    dev = pci_create(bus, args);
    +    dev = pci_new(args);
         ... when != dev = expr
    -    qdev_init_nofail(DEVICE(dev));
    +    pci_realize_and_unref(dev, bus, &error_fatal);

    @@
    expression dev, bus, expr;
    expression list args;
    @@
    -    dev = DEVICE(pci_create(bus, args));
    +    PCIDevice *pci_dev; // TODO move
    +    pci_dev = pci_new(args);
    +    dev = DEVICE(pci_dev);
         ... when != dev = expr
    -    qdev_init_nofail(dev);
    +    pci_realize_and_unref(pci_dev, bus, &error_fatal);

    @@
    expression dev, bus, expr;
    expression list args;
    @@
    -    dev = pci_create_multifunction(bus, args);
    +    dev = pci_new_multifunction(args);
         ... when != dev = expr
    -    qdev_init_nofail(&dev->qdev);
    +    pci_realize_and_unref(dev, bus, &error_fatal);

    @@
    expression bus, expr;
    expression list args;
    identifier dev;
    @@
    -    PCIDevice *dev = pci_create_multifunction(bus, args);
    +    PCIDevice *dev = pci_new_multifunction(args);
         ... when != dev = expr
    -    qdev_init_nofail(&dev->qdev);
    +    pci_realize_and_unref(dev, bus, &error_fatal);

    @@
    expression dev, bus, expr;
    expression list args;
    @@
    -    dev = pci_create_multifunction(bus, args);
    +    dev = pci_new_multifunction(args);
         ... when != dev = expr
    -    qdev_init_nofail(DEVICE(dev));
    +    pci_realize_and_unref(dev, bus, &error_fatal);

Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 7d612261

hw/acpi/piix4.c

+4 −2
Original line number Diff line number Diff line
@@ -514,10 +514,12 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
                      qemu_irq sci_irq, qemu_irq smi_irq,

                      int smm_enabled, DeviceState **piix4_pm)

{

    PCIDevice *pci_dev;

    DeviceState *dev;

    PIIX4PMState *s;



    dev = DEVICE(pci_create(bus, devfn, TYPE_PIIX4_PM));

    pci_dev = pci_new(devfn, TYPE_PIIX4_PM);

    dev = DEVICE(pci_dev);

    qdev_prop_set_uint32(dev, "smb_io_base", smb_io_base);

    if (piix4_pm) {

        *piix4_pm = dev;
@@ -531,7 +533,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
        s->use_acpi_pci_hotplug = false;

    }



    qdev_init_nofail(dev);

    pci_realize_and_unref(pci_dev, bus, &error_fatal);



    return s->smb.smbus;

}

hw/i386/pc_q35.c

+5 −5
Original line number Diff line number Diff line
@@ -100,16 +100,16 @@ static int ehci_create_ich9_with_companions(PCIBus *bus, int slot) 
        return -1;

    }



    ehci = pci_create_multifunction(bus, PCI_DEVFN(slot, 7), true, name);

    qdev_init_nofail(&ehci->qdev);

    ehci = pci_new_multifunction(PCI_DEVFN(slot, 7), true, name);

    pci_realize_and_unref(ehci, bus, &error_fatal);

    usbbus = QLIST_FIRST(&ehci->qdev.child_bus);



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

        uhci = pci_create_multifunction(bus, PCI_DEVFN(slot, comp[i].func),

                                        true, comp[i].name);

        uhci = pci_new_multifunction(PCI_DEVFN(slot, comp[i].func), true,

                                     comp[i].name);

        qdev_prop_set_string(&uhci->qdev, "masterbus", usbbus->name);

        qdev_prop_set_uint32(&uhci->qdev, "firstport", comp[i].port);

        qdev_init_nofail(&uhci->qdev);

        pci_realize_and_unref(uhci, bus, &error_fatal);

    }

    return 0;

}

hw/isa/vt82c686.c

+7 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "hw/isa/apm.h"

#include "hw/acpi/acpi.h"

#include "hw/i2c/pm_smbus.h"

#include "qapi/error.h"

#include "qemu/module.h"

#include "qemu/timer.h"

#include "exec/address-spaces.h"
@@ -276,8 +277,8 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn) 
{

    PCIDevice *dev;



    dev = pci_create(bus, devfn, TYPE_VT82C686B_AC97_DEVICE);

    qdev_init_nofail(&dev->qdev);

    dev = pci_new(devfn, TYPE_VT82C686B_AC97_DEVICE);

    pci_realize_and_unref(dev, bus, &error_fatal);

}



static void via_ac97_class_init(ObjectClass *klass, void *data)
@@ -320,8 +321,8 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn) 
{

    PCIDevice *dev;



    dev = pci_create(bus, devfn, TYPE_VT82C686B_MC97_DEVICE);

    qdev_init_nofail(&dev->qdev);

    dev = pci_new(devfn, TYPE_VT82C686B_MC97_DEVICE);

    pci_realize_and_unref(dev, bus, &error_fatal);

}



static void via_mc97_class_init(ObjectClass *klass, void *data)
@@ -388,12 +389,12 @@ I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
    PCIDevice *dev;

    VT686PMState *s;



    dev = pci_create(bus, devfn, TYPE_VT82C686B_PM_DEVICE);

    dev = pci_new(devfn, TYPE_VT82C686B_PM_DEVICE);

    qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base);



    s = VT82C686B_PM_DEVICE(dev);



    qdev_init_nofail(&dev->qdev);

    pci_realize_and_unref(dev, bus, &error_fatal);



    return s->smb.smbus;

}

hw/mips/fuloong2e.c

+4 −2
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ static void mips_fuloong2e_init(MachineState *machine) 
    long bios_size;

    uint8_t *spd_data;

    int64_t kernel_entry;

    PCIDevice *pci_dev;

    PCIBus *pci_bus;

    ISABus *isa_bus;

    I2CBus *smbus;
@@ -367,10 +368,11 @@ static void mips_fuloong2e_init(MachineState *machine) 


    /* GPU */

    if (vga_interface_type != VGA_NONE) {

        dev = DEVICE(pci_create(pci_bus, -1, "ati-vga"));

        pci_dev = pci_new(-1, "ati-vga");

        dev = DEVICE(pci_dev);

        qdev_prop_set_uint32(dev, "vgamem_mb", 16);

        qdev_prop_set_uint16(dev, "x-device-id", 0x5159);

        qdev_init_nofail(dev);

        pci_realize_and_unref(pci_dev, pci_bus, &error_fatal);

    }



    /* Populate SPD eeprom data */

hw/pci-bridge/dec.c

+3 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "qemu/osdep.h"

#include "dec.h"

#include "hw/sysbus.h"

#include "qapi/error.h"

#include "qemu/module.h"

#include "hw/pci/pci.h"

#include "hw/pci/pci_host.h"
@@ -81,11 +82,10 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn) 
    PCIDevice *dev;

    PCIBridge *br;



    dev = pci_create_multifunction(parent_bus, devfn, false,

                                   "dec-21154-p2p-bridge");

    dev = pci_new_multifunction(devfn, false, "dec-21154-p2p-bridge");

    br = PCI_BRIDGE(dev);

    pci_bridge_map_irq(br, "DEC 21154 PCI-PCI bridge", dec_map_irq);

    qdev_init_nofail(&dev->qdev);

    pci_realize_and_unref(dev, parent_bus, &error_fatal);

    return pci_bridge_get_sec_bus(br);

}