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>
87 lines
2.4 KiB
C
87 lines
2.4 KiB
C
/*
|
|
* ARM RealView Emulation Baseboard Interrupt Controller
|
|
*
|
|
* Copyright (c) 2006-2007 CodeSourcery.
|
|
* Written by Paul Brook
|
|
*
|
|
* This code is licensed under the GPL.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/intc/realview_gic.h"
|
|
#include "hw/irq.h"
|
|
#include "hw/qdev-properties.h"
|
|
|
|
static void realview_gic_set_irq(void *opaque, int irq, int level)
|
|
{
|
|
RealViewGICState *s = (RealViewGICState *)opaque;
|
|
|
|
qemu_set_irq(qdev_get_gpio_in(DEVICE(&s->gic), irq), level);
|
|
}
|
|
|
|
static void realview_gic_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
|
RealViewGICState *s = REALVIEW_GIC(dev);
|
|
SysBusDevice *busdev;
|
|
/* The GICs on the RealView boards have a fixed nonconfigurable
|
|
* number of interrupt lines, so we don't need to expose this as
|
|
* a qdev property.
|
|
*/
|
|
int numirq = 96;
|
|
|
|
qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", numirq);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic), errp)) {
|
|
return;
|
|
}
|
|
busdev = SYS_BUS_DEVICE(&s->gic);
|
|
|
|
/* Pass through outbound IRQ lines from the GIC */
|
|
sysbus_pass_irq(sbd, busdev);
|
|
|
|
/* Pass through inbound GPIO lines to the GIC */
|
|
qdev_init_gpio_in(dev, realview_gic_set_irq, numirq - 32);
|
|
|
|
memory_region_add_subregion(&s->container, 0,
|
|
sysbus_mmio_get_region(busdev, 1));
|
|
memory_region_add_subregion(&s->container, 0x1000,
|
|
sysbus_mmio_get_region(busdev, 0));
|
|
}
|
|
|
|
static void realview_gic_init(Object *obj)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
|
RealViewGICState *s = REALVIEW_GIC(obj);
|
|
|
|
memory_region_init(&s->container, OBJECT(s),
|
|
"realview-gic-container", 0x2000);
|
|
sysbus_init_mmio(sbd, &s->container);
|
|
|
|
object_initialize_child(obj, "gic", &s->gic, TYPE_ARM_GIC);
|
|
qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", 1);
|
|
}
|
|
|
|
static void realview_gic_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = realview_gic_realize;
|
|
}
|
|
|
|
static const TypeInfo realview_gic_info = {
|
|
.name = TYPE_REALVIEW_GIC,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(RealViewGICState),
|
|
.instance_init = realview_gic_init,
|
|
.class_init = realview_gic_class_init,
|
|
};
|
|
|
|
static void realview_gic_register_types(void)
|
|
{
|
|
type_register_static(&realview_gic_info);
|
|
}
|
|
|
|
type_init(realview_gic_register_types)
|