]> git.proxmox.com Git - mirror_qemu.git/commit - hw/s390x/virtio-ccw-input.c
qdev: Convert uses of qdev_set_parent_bus() with Coccinelle
authorMarkus Armbruster <armbru@redhat.com>
Wed, 10 Jun 2020 05:32:00 +0000 (07:32 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Mon, 15 Jun 2020 20:05:08 +0000 (22:05 +0200)
commit99ba777e53ebf31bf24e7a52a21fccdd25f95537
treefccf54cfa20d5a8bd534334bb6d77b1c5fcff5b7
parentdf70796916ebbafe262a01c1c4dc6d7af805de24
qdev: Convert uses of qdev_set_parent_bus() with Coccinelle

In addition to the qdev_create() patterns converted so far, we have a
qdev_set_parent_bus() pattern.  Mostly when we embed a device in a
parent device rather than allocating it on the heap.

This pattern also puts devices in the dangerous "no QOM parent, but
plugged into bus" state I explained in recent commit "qdev: New
qdev_new(), qdev_realize(), etc."

Apply same solution: convert to qdev_realize().  Coccinelle script:

    @@
    expression dev, bus, errp;
    symbol true;
    @@
    -    qdev_set_parent_bus(DEVICE(dev), bus);
         ...
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(DEVICE(dev), bus, errp);

    @ depends on !(file in "qdev-monitor.c") && !(file in "hw/core/qdev.c")@
    expression dev, bus, errp;
    symbol true;
    @@
    -    qdev_set_parent_bus(dev, bus);
         ...
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(dev, bus, errp);

    @@
    expression dev, bus;
    symbol true;
    @@
    -    qdev_set_parent_bus(DEVICE(dev), bus);
         ...
    -    qdev_init_nofail(DEVICE(dev));
    +    qdev_realize(DEVICE(dev), bus, &error_fatal);

Unconverted uses of qdev_set_parent_bus() remain.  They'll be
converted later in this series.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-12-armbru@redhat.com>
[Also convert new hw/virtio/vhost-user-vsock-pci.c]
41 files changed:
hw/display/virtio-gpu-pci.c
hw/display/virtio-vga.c
hw/i386/amd_iommu.c
hw/isa/piix4.c
hw/misc/macio/macio.c
hw/pci-host/designware.c
hw/pci-host/gpex.c
hw/pci-host/pnv_phb3.c
hw/pci-host/pnv_phb4.c
hw/pci-host/q35.c
hw/pci-host/versatile.c
hw/pci-host/xilinx-pcie.c
hw/s390x/vhost-vsock-ccw.c
hw/s390x/virtio-ccw-9p.c
hw/s390x/virtio-ccw-balloon.c
hw/s390x/virtio-ccw-blk.c
hw/s390x/virtio-ccw-crypto.c
hw/s390x/virtio-ccw-gpu.c
hw/s390x/virtio-ccw-input.c
hw/s390x/virtio-ccw-net.c
hw/s390x/virtio-ccw-rng.c
hw/s390x/virtio-ccw-scsi.c
hw/s390x/virtio-ccw-serial.c
hw/virtio/vhost-scsi-pci.c
hw/virtio/vhost-user-blk-pci.c
hw/virtio/vhost-user-fs-pci.c
hw/virtio/vhost-user-scsi-pci.c
hw/virtio/vhost-user-vsock-pci.c
hw/virtio/vhost-vsock-pci.c
hw/virtio/virtio-9p-pci.c
hw/virtio/virtio-balloon-pci.c
hw/virtio/virtio-blk-pci.c
hw/virtio/virtio-crypto-pci.c
hw/virtio/virtio-input-pci.c
hw/virtio/virtio-iommu-pci.c
hw/virtio/virtio-net-pci.c
hw/virtio/virtio-pmem-pci.c
hw/virtio/virtio-rng-pci.c
hw/virtio/virtio-scsi-pci.c
hw/virtio/virtio-serial-pci.c
hw/xen/xen-legacy-backend.c