On Mon, 2 Dec 2019 09:36:21 +0000 Vladimir Sementsov-Ogievskiy <[email protected]> wrote:
> 28.11.2019 1:37, Greg Kurz wrote: > > On Wed, 27 Nov 2019 22:15:49 +0300 > > Vladimir Sementsov-Ogievskiy <[email protected]> wrote: > > > >> Make error_append_security_model_hint and > >> error_append_socket_sockfd_hint hint append helpers well formed: > >> rename errp to errp_in, as it is IN-parameter here (which is unusual > >> for errp). > >> > >> Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> > >> Acked-by: Greg Kurz <[email protected]> > >> --- > >> > >> v6: add Greg's a-b > >> > > > > I've already pushed that to my 9p-next branch: > > > > https://github.com/gkurz/qemu/commits/9p-next > > > Markus proposed to use Error *const *errp for such cases (among other > things) > > So, seems there would be v7, the current version is here: > git://repo.or.cz/qemu/armbru.git branch error-prep > > Discussion is here: > https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg04633.html > and here: > https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg04636.html > Ok, this makes sense. It's cleaner and it addresses your concern with coccinelle, so I've dropped the patch from my 9p-next branch. > > > > > >> hw/9pfs/9p-local.c | 4 ++-- > >> hw/9pfs/9p-proxy.c | 5 +++-- > >> 2 files changed, 5 insertions(+), 4 deletions(-) > >> > >> diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > >> index 4708c0bd89..76fa1858b7 100644 > >> --- a/hw/9pfs/9p-local.c > >> +++ b/hw/9pfs/9p-local.c > >> @@ -1473,9 +1473,9 @@ static void local_cleanup(FsContext *ctx) > >> g_free(data); > >> } > >> > >> -static void error_append_security_model_hint(Error **errp) > >> +static void error_append_security_model_hint(Error **errp_in) > >> { > >> - error_append_hint(errp, "Valid options are: security_model=" > >> + error_append_hint(errp_in, "Valid options are: security_model=" > >> "[passthrough|mapped-xattr|mapped-file|none]\n"); > >> } > >> > >> diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c > >> index 97ab9c58a5..9e29abc3ef 100644 > >> --- a/hw/9pfs/9p-proxy.c > >> +++ b/hw/9pfs/9p-proxy.c > >> @@ -1114,9 +1114,10 @@ static int connect_namedsocket(const char *path, > >> Error **errp) > >> return sockfd; > >> } > >> > >> -static void error_append_socket_sockfd_hint(Error **errp) > >> +static void error_append_socket_sockfd_hint(Error **errp_in) > >> { > >> - error_append_hint(errp, "Either specify socket=/some/path where > >> /some/path" > >> + error_append_hint(errp_in, > >> + "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" > >> " socket\n"); > > > >
