virtiofsd: Call qemu_init_exec_dir

[PATCH] virtiofsd: Call qemu_init_exec_dir

Posted by Dr. David Alan Gilbert (git) 3 years, 7 months ago

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Since fcb4f59c879 qemu_get_local_state_pathname relies on the
init_exec_dir, and virtiofsd asserts because we never set it.
Set it.

Reported-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 tools/virtiofsd/passthrough_ll.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 0b229ebd57..cce983ca63 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -2839,6 +2839,8 @@ int main(int argc, char *argv[])
     /* Don't mask creation mode, kernel already did that */
     umask(0);
 
+    qemu_init_exec_dir(argv[0]);
+
     pthread_mutex_init(&lo.mutex, NULL);
     lo.inodes = g_hash_table_new(lo_key_hash, lo_key_equal);
     lo.root.fd = -1;
-- 
2.26.2

Re: [PATCH] virtiofsd: Call qemu_init_exec_dir

Posted by Stefan Hajnoczi 3 years, 7 months ago

On Fri, Oct 02, 2020 at 01:40:15PM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> Since fcb4f59c879 qemu_get_local_state_pathname relies on the
> init_exec_dir, and virtiofsd asserts because we never set it.
> Set it.
> 
> Reported-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
>  tools/virtiofsd/passthrough_ll.c | 2 ++
>  1 file changed, 2 insertions(+)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [PATCH] virtiofsd: Call qemu_init_exec_dir

Posted by Dr. David Alan Gilbert 3 years, 7 months ago

* Dr. David Alan Gilbert (git) (dgilbert@redhat.com) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> Since fcb4f59c879 qemu_get_local_state_pathname relies on the
> init_exec_dir, and virtiofsd asserts because we never set it.
> Set it.
> 
> Reported-by: Alex BennÃ©e <alex.bennee@linaro.org>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Queued

> ---
>  tools/virtiofsd/passthrough_ll.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
> index 0b229ebd57..cce983ca63 100644
> --- a/tools/virtiofsd/passthrough_ll.c
> +++ b/tools/virtiofsd/passthrough_ll.c
> @@ -2839,6 +2839,8 @@ int main(int argc, char *argv[])
>      /* Don't mask creation mode, kernel already did that */
>      umask(0);
>  
> +    qemu_init_exec_dir(argv[0]);
> +
>      pthread_mutex_init(&lo.mutex, NULL);
>      lo.inodes = g_hash_table_new(lo_key_hash, lo_key_equal);
>      lo.root.fd = -1;
> -- 
> 2.26.2
> 
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH] virtiofsd: Call qemu_init_exec_dir

Posted by Alex Bennée 3 years, 7 months ago

"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> writes:

> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> Since fcb4f59c879 qemu_get_local_state_pathname relies on the
> init_exec_dir, and virtiofsd asserts because we never set it.
> Set it.
>
> Reported-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tools/virtiofsd/passthrough_ll.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
> index 0b229ebd57..cce983ca63 100644
> --- a/tools/virtiofsd/passthrough_ll.c
> +++ b/tools/virtiofsd/passthrough_ll.c
> @@ -2839,6 +2839,8 @@ int main(int argc, char *argv[])
>      /* Don't mask creation mode, kernel already did that */
>      umask(0);
>  
> +    qemu_init_exec_dir(argv[0]);
> +
>      pthread_mutex_init(&lo.mutex, NULL);
>      lo.inodes = g_hash_table_new(lo_key_hash, lo_key_equal);
>      lo.root.fd = -1;

-- 
Alex Bennée