| Message ID | 20190924200902.4703-24-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | error: auto propagated local_err | expand |
On 9/24/19 3:09 PM, Vladimir Sementsov-Ogievskiy wrote: > If we want append hint to errp, we must use ERRP_FUNCTION_BEGIN macro. > Otherwise hint will not be appended in case of errp == &fatal_err > (program will exit before error_append_hint() call). Fix such cases. > > This commit (together with its neighbors) was generated by > > git grep -l 'error_append_hint(errp' | while read f; do \ > spatch --sp-file scripts/coccinelle/fix-error_append_hint-usage.cocci \ > --in-place $f; done > > and then > > ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" > > (auto-msg was a file with this commit message) > > Still, for backporting it may be more comfortable to use only the first > command and then do one huge commit. > > Reported-by: Greg Kurz <groug@kaod.org> > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > util/qemu-sockets.c | 2 ++ > 1 file changed, 2 insertions(+) git grep -p 'error_append_hint(errp' util/*sockets* nicely shows these same two functions. Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 98ff3a1cce..fb21b78369 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -860,6 +860,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, int num, Error **errp) { + ERRP_FUNCTION_BEGIN(); struct sockaddr_un un; int sock, fd; char *pathbuf = NULL; @@ -935,6 +936,7 @@ err: static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) { + ERRP_FUNCTION_BEGIN(); struct sockaddr_un un; int sock, rc; size_t pathlen;
If we want append hint to errp, we must use ERRP_FUNCTION_BEGIN macro. Otherwise hint will not be appended in case of errp == &fatal_err (program will exit before error_append_hint() call). Fix such cases. This commit (together with its neighbors) was generated by git grep -l 'error_append_hint(errp' | while read f; do \ spatch --sp-file scripts/coccinelle/fix-error_append_hint-usage.cocci \ --in-place $f; done and then ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" (auto-msg was a file with this commit message) Still, for backporting it may be more comfortable to use only the first command and then do one huge commit. Reported-by: Greg Kurz <groug@kaod.org> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- util/qemu-sockets.c | 2 ++ 1 file changed, 2 insertions(+)