mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-02 22:41:07 +00:00
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>
|
||
|---|---|---|
| .. | ||
| e500-ccsr.h | ||
| e500.c | ||
| e500.h | ||
| e500plat.c | ||
| fdt.c | ||
| fw_cfg.c | ||
| Kconfig | ||
| mac.h | ||
| mac_newworld.c | ||
| mac_oldworld.c | ||
| Makefile.objs | ||
| mpc8544_guts.c | ||
| mpc8544ds.c | ||
| pnv.c | ||
| pnv_bmc.c | ||
| pnv_core.c | ||
| pnv_homer.c | ||
| pnv_lpc.c | ||
| pnv_occ.c | ||
| pnv_pnor.c | ||
| pnv_psi.c | ||
| pnv_xscom.c | ||
| ppc.c | ||
| ppc4xx_devs.c | ||
| ppc4xx_pci.c | ||
| ppc405.h | ||
| ppc405_boards.c | ||
| ppc405_uc.c | ||
| ppc440.h | ||
| ppc440_bamboo.c | ||
| ppc440_pcix.c | ||
| ppc440_uc.c | ||
| ppc_booke.c | ||
| ppce500_spin.c | ||
| prep.c | ||
| prep_systemio.c | ||
| rs6000_mc.c | ||
| sam460ex.c | ||
| spapr.c | ||
| spapr_caps.c | ||
| spapr_cpu_core.c | ||
| spapr_drc.c | ||
| spapr_events.c | ||
| spapr_hcall.c | ||
| spapr_iommu.c | ||
| spapr_irq.c | ||
| spapr_nvdimm.c | ||
| spapr_ovec.c | ||
| spapr_pci.c | ||
| spapr_pci_nvlink2.c | ||
| spapr_pci_vfio.c | ||
| spapr_rng.c | ||
| spapr_rtas.c | ||
| spapr_rtas_ddw.c | ||
| spapr_rtc.c | ||
| spapr_tpm_proxy.c | ||
| spapr_vio.c | ||
| trace-events | ||
| virtex_ml507.c | ||