@@ -1471,6 +1471,7 @@ static void local_cleanup(FsContext *ctx)
static void error_append_security_model_hint(Error **errp)
{
+ ERRP_FUNCTION_BEGIN();
error_append_hint(errp, "Valid options are: security_model="
"[passthrough|mapped-xattr|mapped-file|none]\n");
}
@@ -1116,6 +1116,7 @@ static int connect_namedsocket(const char *path, Error **errp)
static void error_append_socket_sockfd_hint(Error **errp)
{
+ ERRP_FUNCTION_BEGIN();
error_append_hint(errp, "Either specify socket=/some/path where /some/path"
" points to a listening AF_UNIX socket or sock_fd=fd"
" where fd is a file descriptor to a connected AF_UNIX"
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> --- hw/9pfs/9p-local.c | 1 + hw/9pfs/9p-proxy.c | 1 + 2 files changed, 2 insertions(+)