diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-12 14:47:42 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-12 14:47:42 +0000 |
| commit | 474acbe05d6a9c53ac358b45d8a095c6a68a10d6 (patch) | |
| tree | 3c16acf544bce351d028b02e69111fab982da8a7 /hw | |
| parent | d46f81cb746d18b4530b5fe63e75b11f6b926f1f (diff) | |
| parent | 659f1953281bcfa5ac217e42877d7d3c32eeea38 (diff) | |
| download | focaccia-qemu-474acbe05d6a9c53ac358b45d8a095c6a68a10d6.tar.gz focaccia-qemu-474acbe05d6a9c53ac358b45d8a095c6a68a10d6.zip | |
Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-03-10' into staging
Fix the proxy fsdev so that it honours "readonly" and "writeout". # gpg: Signature made Tue 10 Mar 2020 15:16:39 GMT # gpg: using RSA key B4828BAF943140CEF2A3491071D4D5E5822F73D6 # gpg: Good signature from "Greg Kurz <groug@kaod.org>" [full] # gpg: aka "Gregory Kurz <gregory.kurz@free.fr>" [full] # gpg: aka "[jpeg image of size 3330]" [full] # Primary key fingerprint: B482 8BAF 9431 40CE F2A3 4910 71D4 D5E5 822F 73D6 * remotes/gkurz/tags/9p-next-2020-03-10: 9p/proxy: Fix export_flags Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/9pfs/9p-proxy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 8136e1342d..6f598a0f11 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; } |