xen: Use ERRP_GUARD()
If we want to check error after errp-function call, we need to introduce local_err and then propagate it to errp. Instead, use the ERRP_GUARD() macro, benefits are: 1. No need of explicit error_propagate call 2. No need of explicit local_err variable: use errp directly 3. ERRP_GUARD() leaves errp as is if it's not NULL or &error_fatal, this means that we don't break error_abort (we'll abort on error_set, not on error_propagate) If we want to add some info to errp (by error_prepend() or error_append_hint()), we must use the ERRP_GUARD() macro. Otherwise, this info will not be added when errp == &error_fatal (the program will exit prior to the error_append_hint() or error_prepend() call). No such cases are being fixed here. This commit is generated by command sed -n '/^X86 Xen CPUs$/,/^$/{s/^F: //p}' MAINTAINERS | \ xargs git ls-files | grep '\.[hc]$' | \ xargs spatch \ --sp-file scripts/coccinelle/errp-guard.cocci \ --macro-file scripts/cocci-macro-file.h \ --in-place --no-show-diff --max-width 80 Reported-by:Kevin Wolf <kwolf@redhat.com> Reported-by:
Greg Kurz <groug@kaod.org> Signed-off-by:
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by:
Philippe Mathieu-Daudé <philmd@redhat.com> [Commit message tweaked] Signed-off-by:
Markus Armbruster <armbru@redhat.com> Message-Id: <20200707165037.1026246-9-armbru@redhat.com> [ERRP_AUTO_PROPAGATE() renamed to ERRP_GUARD(), and auto-propagated-errp.cocci to errp-guard.cocci. Commit message tweaked again.]
Showing
- hw/block/dataplane/xen-block.c 7 additions, 10 deletionshw/block/dataplane/xen-block.c
- hw/block/xen-block.c 43 additions, 59 deletionshw/block/xen-block.c
- hw/pci-host/xen_igd_pt.c 3 additions, 4 deletionshw/pci-host/xen_igd_pt.c
- hw/xen/xen-backend.c 3 additions, 4 deletionshw/xen/xen-backend.c
- hw/xen/xen-bus.c 39 additions, 53 deletionshw/xen/xen-bus.c
- hw/xen/xen-host-pci-device.c 13 additions, 14 deletionshw/xen/xen-host-pci-device.c
- hw/xen/xen_pt.c 11 additions, 14 deletionshw/xen/xen_pt.c
- hw/xen/xen_pt_config_init.c 9 additions, 8 deletionshw/xen/xen_pt_config_init.c
Loading
Please register or sign in to comment