When all we do with an Error we receive into a local variable is propagating to somewhere else, we can just as well receive it there right away. Convert if (!foo(..., &err)) { ... error_propagate(errp, err); ... return ... } to if (!foo(..., errp)) { ... ... return ... } where nothing else needs @err. Coccinelle script: @rule1 forall@ identifier fun, err, errp, lbl; expression list args, args2; binary operator op; constant c1, c2; symbol false; @@ if ( ( - fun(args, &err, args2) + fun(args, errp, args2) | - !fun(args, &err, args2) + !fun(args, errp, args2) | - fun(args, &err, args2) op c1 + fun(args, errp, args2) op c1 ) ) { ... when != err when != lbl: when strict - error_propagate(errp, err); ... when != err ( return; | return c2; | return false; ) } @rule2 forall@ identifier fun, err, errp, lbl; expression list args, args2; expression var; binary operator op; constant c1, c2; symbol false; @@ - var = fun(args, &err, args2); + var = fun(args, errp, args2); ... when != err if ( ( var | !var | var op c1 ) ) { ... when != err when != lbl: when strict - error_propagate(errp, err); ... when != err ( return; | return c2; | return false; | return var; ) } @depends on rule1 || rule2@ identifier err; @@ - Error *err = NULL; ... when != err Not exactly elegant, I'm afraid. The "when != lbl:" is necessary to avoid transforming if (fun(args, &err)) { goto out } ... out: error_propagate(errp, err); even though other paths to label out still need the error_propagate(). For an actual example, see sclp_realize(). Without the "when strict", Coccinelle transforms vfio_msix_setup(), incorrectly. I don't know what exactly "when strict" does, only that it helps here. The match of return is narrower than what I want, but I can't figure out how to express "return where the operand doesn't use @err". For an example where it's too narrow, see vfio_intx_enable(). Silently fails to convert hw/arm/armsse.c, because Coccinelle gets confused by ARMSSE being used both as typedef and function-like macro there. Converted manually. Line breaks tidied up manually. One nested declaration of @local_err deleted manually. Preexisting unwanted blank line dropped in hw/riscv/sifive_e.c. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200707160613.848843-35-armbru@redhat.com>
99 lines
2.8 KiB
C
99 lines
2.8 KiB
C
/*
|
|
* Virtio video device
|
|
*
|
|
* Copyright Red Hat
|
|
*
|
|
* Authors:
|
|
* Dave Airlie
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/pci/pci.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/virtio/virtio.h"
|
|
#include "hw/virtio/virtio-bus.h"
|
|
#include "hw/virtio/virtio-gpu-pci.h"
|
|
|
|
static Property virtio_gpu_pci_base_properties[] = {
|
|
DEFINE_VIRTIO_GPU_PCI_PROPERTIES(VirtIOPCIProxy),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
{
|
|
VirtIOGPUPCIBase *vgpu = VIRTIO_GPU_PCI_BASE(vpci_dev);
|
|
VirtIOGPUBase *g = vgpu->vgpu;
|
|
DeviceState *vdev = DEVICE(g);
|
|
int i;
|
|
|
|
virtio_pci_force_virtio_1(vpci_dev);
|
|
if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) {
|
|
return;
|
|
}
|
|
|
|
for (i = 0; i < g->conf.max_outputs; i++) {
|
|
object_property_set_link(OBJECT(g->scanout[i].con), "device",
|
|
OBJECT(vpci_dev), &error_abort);
|
|
}
|
|
}
|
|
|
|
static void virtio_gpu_pci_base_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
|
|
PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
|
|
|
|
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
|
|
device_class_set_props(dc, virtio_gpu_pci_base_properties);
|
|
dc->hotpluggable = false;
|
|
k->realize = virtio_gpu_pci_base_realize;
|
|
pcidev_k->class_id = PCI_CLASS_DISPLAY_OTHER;
|
|
}
|
|
|
|
static const TypeInfo virtio_gpu_pci_base_info = {
|
|
.name = TYPE_VIRTIO_GPU_PCI_BASE,
|
|
.parent = TYPE_VIRTIO_PCI,
|
|
.instance_size = sizeof(VirtIOGPUPCIBase),
|
|
.class_init = virtio_gpu_pci_base_class_init,
|
|
.abstract = true
|
|
};
|
|
|
|
#define TYPE_VIRTIO_GPU_PCI "virtio-gpu-pci"
|
|
#define VIRTIO_GPU_PCI(obj) \
|
|
OBJECT_CHECK(VirtIOGPUPCI, (obj), TYPE_VIRTIO_GPU_PCI)
|
|
|
|
typedef struct VirtIOGPUPCI {
|
|
VirtIOGPUPCIBase parent_obj;
|
|
VirtIOGPU vdev;
|
|
} VirtIOGPUPCI;
|
|
|
|
static void virtio_gpu_initfn(Object *obj)
|
|
{
|
|
VirtIOGPUPCI *dev = VIRTIO_GPU_PCI(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
TYPE_VIRTIO_GPU);
|
|
VIRTIO_GPU_PCI_BASE(obj)->vgpu = VIRTIO_GPU_BASE(&dev->vdev);
|
|
}
|
|
|
|
static const VirtioPCIDeviceTypeInfo virtio_gpu_pci_info = {
|
|
.generic_name = TYPE_VIRTIO_GPU_PCI,
|
|
.parent = TYPE_VIRTIO_GPU_PCI_BASE,
|
|
.instance_size = sizeof(VirtIOGPUPCI),
|
|
.instance_init = virtio_gpu_initfn,
|
|
};
|
|
|
|
static void virtio_gpu_pci_register_types(void)
|
|
{
|
|
type_register_static(&virtio_gpu_pci_base_info);
|
|
virtio_pci_types_register(&virtio_gpu_pci_info);
|
|
}
|
|
|
|
type_init(virtio_gpu_pci_register_types)
|