mirror of
https://github.com/xemu-project/xemu.git
synced 2024-12-03 17:11:01 +00:00
dcfe480544
Replace
error_setg(&err, ...);
error_propagate(errp, err);
by
error_setg(errp, ...);
Related pattern:
if (...) {
error_setg(&err, ...);
goto out;
}
...
out:
error_propagate(errp, err);
return;
When all paths to label out are that way, replace by
if (...) {
error_setg(errp, ...);
return;
}
and delete the label along with the error_propagate().
When we have at most one other path that actually needs to propagate,
and maybe one at the end that where propagation is unnecessary, e.g.
foo(..., &err);
if (err) {
goto out;
}
...
bar(..., &err);
out:
error_propagate(errp, err);
return;
move the error_propagate() to where it's needed, like
if (...) {
foo(..., &err);
error_propagate(errp, err);
return;
}
...
bar(..., errp);
return;
and transform the error_setg() as above.
In some places, the transformation results in obviously unnecessary
error_propagate(). The next few commits will eliminate them.
Bonus: the elimination of gotos will make later patches in this series
easier to review.
Candidates for conversion tracked down with this Coccinelle script:
@@
identifier err, errp;
expression list args;
@@
- error_setg(&err, args);
+ error_setg(errp, args);
... when != err
error_propagate(errp, err);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-34-armbru@redhat.com>
|
||
|---|---|---|
| .. | ||
| 3270-ccw.c | ||
| ap-bridge.c | ||
| ap-device.c | ||
| ccw-device.c | ||
| ccw-device.h | ||
| css-bridge.c | ||
| css.c | ||
| event-facility.c | ||
| ipl.c | ||
| ipl.h | ||
| Kconfig | ||
| Makefile.objs | ||
| pv.c | ||
| s390-ccw.c | ||
| s390-pci-bus.c | ||
| s390-pci-bus.h | ||
| s390-pci-inst.c | ||
| s390-pci-inst.h | ||
| s390-skeys-kvm.c | ||
| s390-skeys.c | ||
| s390-stattrib-kvm.c | ||
| s390-stattrib.c | ||
| s390-virtio-ccw.c | ||
| s390-virtio-hcall.c | ||
| s390-virtio-hcall.h | ||
| sclp.c | ||
| sclpcpu.c | ||
| sclpquiesce.c | ||
| tod-kvm.c | ||
| tod-qemu.c | ||
| tod.c | ||
| trace-events | ||
| vhost-vsock-ccw.c | ||
| virtio-ccw-9p.c | ||
| virtio-ccw-balloon.c | ||
| virtio-ccw-blk.c | ||
| virtio-ccw-crypto.c | ||
| virtio-ccw-gpu.c | ||
| virtio-ccw-input.c | ||
| virtio-ccw-net.c | ||
| virtio-ccw-rng.c | ||
| virtio-ccw-scsi.c | ||
| virtio-ccw-serial.c | ||
| virtio-ccw.c | ||
| virtio-ccw.h | ||