diff options
| author | Richard Henderson | 2022-04-25 19:21:56 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-04-25 19:21:56 +0200 |
| commit | c49abc8406086398de4062ce9b58f67a23b0ca1f (patch) | |
| tree | 92a0522cec4f2b68c6c6ace6a3976c46bfbff2f1 /tools | |
| parent | Merge tag 'pull-target-arm-20220422-1' of https://git.linaro.org/people/pmayd... (diff) | |
| parent | virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (diff) | |
| download | qemu-c49abc8406086398de4062ce9b58f67a23b0ca1f.tar.gz qemu-c49abc8406086398de4062ce9b58f67a23b0ca1f.tar.xz qemu-c49abc8406086398de4062ce9b58f67a23b0ca1f.zip | |
Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging
Pull request
Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
improvements.
# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmJmYGYACgkQnKSrs4Gr
# c8gNIAgAgCEeBMP61cdT8DGBBw26abmrNmCCjXYL3rNcR2GNsn0x9VbedBhSPt9O
# z+/nej9UkRKHgQ/+V1LqWD2D/TU327nLQ74z1JJvGtjWhvM18XTTAeh1BQbVywKU
# z+o6WSyP22Xx87cUIuOGGMgNDDfIY2j/t5sU8eR+lxXxDuKXx3tulTV65QlNSw9z
# 19rb8eJkaau5YWhN5gPEI65O/YVgGUtA+c5z39AoBG85XAAhm+6+mTFfuy8J8gp/
# wqr61+xB7bB3AxIOv1/0PWCl3F/+kPs7ybJRGkHMNtKyJtp34Y86kwsVEBtOMGVO
# wm/ht7FMy2GhnaKGjNMtvJm29ZArqA==
# =zZcV
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 25 Apr 2022 01:48:38 AM PDT
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
* tag 'block-pull-request' of https://gitlab.com/stefanha/qemu:
virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
Implements Backend Program conventions for vhost-user-scsi
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtiofsd/helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index e226fc590f..f8981e5bdf 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -188,6 +188,9 @@ void fuse_cmdline_help(void) " -o announce_submounts Announce sub-mount points to the guest\n" " -o posix_acl/no_posix_acl Enable/Disable posix_acl. (default: disabled)\n" " -o security_label/no_security_label Enable/Disable security label. (default: disabled)\n" + " -o killpriv_v2/no_killpriv_v2\n" + " Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n" + " (default: enabled as long as client supports it)\n" ); } |