[PATCH] 9p/proxy: Fix export_flags

[PATCH] 9p/proxy: Fix export_flags

[Greg Kurz]

The common fsdev options are set by qemu_fsdev_add() before it calls
the backend specific option parsing code. In the case of "proxy" this
means "writeout" or "readonly" were simply ignored. This has been
broken from the beginning.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/9pfs/9p-proxy.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index 8136e1342d78..6f598a0f111c 100644
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -1139,10 +1139,10 @@ static int proxy_parse_opts(QemuOpts *opts, FsDriverEntry *fs, Error **errp)
     }
     if (socket) {
         fs->path = g_strdup(socket);
-        fs->export_flags = V9FS_PROXY_SOCK_NAME;
+        fs->export_flags |= V9FS_PROXY_SOCK_NAME;
     } else {
         fs->path = g_strdup(sock_fd);
-        fs->export_flags = V9FS_PROXY_SOCK_FD;
+        fs->export_flags |= V9FS_PROXY_SOCK_FD;
     }
     return 0;
 }

Re: [PATCH] 9p/proxy: Fix export_flags

[no-reply]

Patchew URL: https://patchew.org/QEMU/158349633705.1237488.8895481990204796135.stgit@bahia.lan/



Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===

File: "/tmp/qemu-nsis\qemu-doc.html" -> no files found.
Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] |
   /oname=outfile one_file_only)
Error in script "/tmp/qemu-test/src/qemu.nsi" on line 180 -- aborting creation process
make: *** [Makefile:1162: qemu-setup-4.2.50.exe] Error 1
Traceback (most recent call last):
  File "./tests/docker/docker.py", line 664, in <module>
    sys.exit(main())
---
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=5a2f2ef346de48d9b7a9ba1a4db42fcb', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-i2sv7yrj/src/docker-src.2020-03-06-08.00.53.16693:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=5a2f2ef346de48d9b7a9ba1a4db42fcb
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-i2sv7yrj/src'
make: *** [docker-run-test-mingw@fedora] Error 2

real    3m40.326s
user    0m8.690s


The full log is available at
http://patchew.org/logs/158349633705.1237488.8895481990204796135.stgit@bahia.lan/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [PATCH] 9p/proxy: Fix export_flags

[Philippe Mathieu-Daudé]

On 3/6/20 1:05 PM, Greg Kurz wrote:
> The common fsdev options are set by qemu_fsdev_add() before it calls
> the backend specific option parsing code. In the case of "proxy" this
> means "writeout" or "readonly" were simply ignored. This has been
> broken from the beginning.

oops...

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>   hw/9pfs/9p-proxy.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
> index 8136e1342d78..6f598a0f111c 100644
> --- a/hw/9pfs/9p-proxy.c
> +++ b/hw/9pfs/9p-proxy.c
> @@ -1139,10 +1139,10 @@ static int proxy_parse_opts(QemuOpts *opts, FsDriverEntry *fs, Error **errp)
>       }
>       if (socket) {
>           fs->path = g_strdup(socket);
> -        fs->export_flags = V9FS_PROXY_SOCK_NAME;
> +        fs->export_flags |= V9FS_PROXY_SOCK_NAME;
>       } else {
>           fs->path = g_strdup(sock_fd);
> -        fs->export_flags = V9FS_PROXY_SOCK_FD;
> +        fs->export_flags |= V9FS_PROXY_SOCK_FD;
>       }
>       return 0;
>   }
> 
> 

Re: [PATCH] 9p/proxy: Fix export_flags

[Christian Schoenebeck]

On Freitag, 6. März 2020 13:05:37 CET Greg Kurz wrote:
> The common fsdev options are set by qemu_fsdev_add() before it calls
> the backend specific option parsing code. In the case of "proxy" this
> means "writeout" or "readonly" were simply ignored. This has been
> broken from the beginning.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>

> ---
>  hw/9pfs/9p-proxy.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
> index 8136e1342d78..6f598a0f111c 100644
> --- a/hw/9pfs/9p-proxy.c
> +++ b/hw/9pfs/9p-proxy.c
> @@ -1139,10 +1139,10 @@ static int proxy_parse_opts(QemuOpts *opts,
> FsDriverEntry *fs, Error **errp) }
>      if (socket) {
>          fs->path = g_strdup(socket);
> -        fs->export_flags = V9FS_PROXY_SOCK_NAME;
> +        fs->export_flags |= V9FS_PROXY_SOCK_NAME;
>      } else {
>          fs->path = g_strdup(sock_fd);
> -        fs->export_flags = V9FS_PROXY_SOCK_FD;
> +        fs->export_flags |= V9FS_PROXY_SOCK_FD;
>      }
>      return 0;
>  }