On Thu, 5 Dec 2019 18:08:56 +0100
Greg Kurz <[email protected]> wrote:
> On Thu, 5 Dec 2019 18:20:06 +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]>
>
With an updated changelog that no longer mentions errp_in :)
> > hw/9pfs/9p-local.c | 2 +-
> > hw/9pfs/9p-proxy.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
> > index 4708c0bd89..ca641390fb 100644
> > --- a/hw/9pfs/9p-local.c
> > +++ b/hw/9pfs/9p-local.c
> > @@ -1473,7 +1473,7 @@ 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 *const *errp)
> > {
> > error_append_hint(errp, "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..8136e1342d 100644
> > --- a/hw/9pfs/9p-proxy.c
> > +++ b/hw/9pfs/9p-proxy.c
> > @@ -1114,7 +1114,7 @@ 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 *const *errp)
> > {
> > error_append_hint(errp, "Either specify socket=/some/path where
> > /some/path"
> > " points to a listening AF_UNIX socket or sock_fd=fd"
>
