9pfs: well form error hint helpers
PATCH v6 1/1 9pfs: well form error hint helpers
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).
---
v6: add Greg's a-b
hw/9pfs/9p-local.c | 4 ++-- hw/9pfs/9p-proxy.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
hw/9pfs/9p-local.c +2 -2
@@ -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" ); }
hw/9pfs/9p-proxy.c +3 -2
@@ -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" );
Signature · 1 line
2.21.0
Quoted 11 lines · On Wed, 27 Nov 2019 22:15:49 +0300 Vladimir Sementsov-Ogievskiy…
Make
error_append_security_model_hintanderror_append_socket_sockfd_hinthint append helpers well formed:
rename errp toerrp_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
Quoted 37 lines
hw/9pfs/9p-local.c | 4 ++-- hw/9pfs/9p-proxy.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)hw/9pfs/9p-local.c +2
-2@@ -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" ); }hw/9pfs/9p-proxy.c +3
-2@@ -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" );
Quoted 12 lines · Greg Kurz
Quoted 9 lines · On Wed, 27 Nov 2019 22:15:49 +0300 Vladimir Sementsov-Ogievskiy…
Make
error_append_security_model_hintanderror_append_socket_sockfd_hinthint append helpers well formed:
rename errp toerrp_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]>---
Quoted 6 lines
Quoted 2 lines
v6: add Greg's a-b
I've already pushed that to my 9p-next branch:
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
Quoted 40 lines
Quoted 39 lines
hw/9pfs/9p-local.c | 4 ++-- hw/9pfs/9p-proxy.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)hw/9pfs/9p-local.c +2
-2@@ -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" ); }hw/9pfs/9p-proxy.c +3
-2@@ -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" );
Signature · 2 lines
Best regards, Vladimir
Quoted 24 lines · On Mon, 2 Dec 2019 09:36:21 +0000 Vladimir Sementsov-Ogievskiy…
Quoted 12 lines · Greg Kurz
Quoted 9 lines · On Wed, 27 Nov 2019 22:15:49 +0300 Vladimir Sementsov-Ogievskiy…
Make
error_append_security_model_hintanderror_append_socket_sockfd_hinthint append helpers well formed:
rename errp toerrp_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]>---
Quoted 6 lines
Quoted 2 lines
v6: add Greg's a-b
I've already pushed that to my 9p-next branch:
Markus proposed to use Error *const *errp for such cases (among other things)
Quoted 8 lines
So, seems there would be v7, the current version is here:
git://repo.or.cz/qemu/armbru.gitbranch error-prepDiscussion 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.
Quoted 42 lines
Quoted 40 lines
Quoted 39 lines
hw/9pfs/9p-local.c | 4 ++-- hw/9pfs/9p-proxy.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)hw/9pfs/9p-local.c +2
-2@@ -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" ); }hw/9pfs/9p-proxy.c +3
-2@@ -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" );