668f62ec62
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>
85 lines
2.3 KiB
C
85 lines
2.3 KiB
C
/*
|
|
* Virtio rng PCI Bindings
|
|
*
|
|
* Copyright 2012 Red Hat, Inc.
|
|
* Copyright 2012 Amit Shah <amit.shah@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or
|
|
* (at your option) any later version. See the COPYING file in the
|
|
* top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "virtio-pci.h"
|
|
#include "hw/virtio/virtio-rng.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
|
|
typedef struct VirtIORngPCI VirtIORngPCI;
|
|
|
|
/*
|
|
* virtio-rng-pci: This extends VirtioPCIProxy.
|
|
*/
|
|
#define TYPE_VIRTIO_RNG_PCI "virtio-rng-pci-base"
|
|
#define VIRTIO_RNG_PCI(obj) \
|
|
OBJECT_CHECK(VirtIORngPCI, (obj), TYPE_VIRTIO_RNG_PCI)
|
|
|
|
struct VirtIORngPCI {
|
|
VirtIOPCIProxy parent_obj;
|
|
VirtIORNG vdev;
|
|
};
|
|
|
|
static void virtio_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
{
|
|
VirtIORngPCI *vrng = VIRTIO_RNG_PCI(vpci_dev);
|
|
DeviceState *vdev = DEVICE(&vrng->vdev);
|
|
|
|
if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) {
|
|
return;
|
|
}
|
|
|
|
object_property_set_link(OBJECT(vrng), "rng", OBJECT(vrng->vdev.conf.rng),
|
|
NULL);
|
|
}
|
|
|
|
static void virtio_rng_pci_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
|
|
PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
|
|
|
|
k->realize = virtio_rng_pci_realize;
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
|
pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
|
|
pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_RNG;
|
|
pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
|
|
pcidev_k->class_id = PCI_CLASS_OTHERS;
|
|
}
|
|
|
|
static void virtio_rng_initfn(Object *obj)
|
|
{
|
|
VirtIORngPCI *dev = VIRTIO_RNG_PCI(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
TYPE_VIRTIO_RNG);
|
|
}
|
|
|
|
static const VirtioPCIDeviceTypeInfo virtio_rng_pci_info = {
|
|
.base_name = TYPE_VIRTIO_RNG_PCI,
|
|
.generic_name = "virtio-rng-pci",
|
|
.transitional_name = "virtio-rng-pci-transitional",
|
|
.non_transitional_name = "virtio-rng-pci-non-transitional",
|
|
.instance_size = sizeof(VirtIORngPCI),
|
|
.instance_init = virtio_rng_initfn,
|
|
.class_init = virtio_rng_pci_class_init,
|
|
};
|
|
|
|
static void virtio_rng_pci_register(void)
|
|
{
|
|
virtio_pci_types_register(&virtio_rng_pci_info);
|
|
}
|
|
|
|
type_init(virtio_rng_pci_register)
|