diff options
| author | Peter Maydell | 2022-02-01 20:48:15 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-02-01 20:48:15 +0100 |
| commit | 47cc1a3655135b89fa75c2824fbddd29df874612 (patch) | |
| tree | 84dacddc6f41dd0dd2af33fec28eb2f4b255e095 /storage-daemon/qemu-storage-daemon.c | |
| parent | Merge remote-tracking branch 'remotes/hreitz-gitlab/tags/pull-block-2022-02-0... (diff) | |
| parent | block/rbd: workaround for ceph issue #53784 (diff) | |
| download | qemu-47cc1a3655135b89fa75c2824fbddd29df874612.tar.gz qemu-47cc1a3655135b89fa75c2824fbddd29df874612.tar.xz qemu-47cc1a3655135b89fa75c2824fbddd29df874612.zip | |
Merge remote-tracking branch 'remotes/kwolf-gitlab/tags/for-upstream' into staging
Block layer patches
- rbd: fix handling of holes in .bdrv_co_block_status
- Fix potential crash in bdrv_set_backing_hd()
- vhost-user-blk export: Fix shutdown with requests in flight
- FUSE export: Fix build failure on FreeBSD
- Documentation improvements
# gpg: Signature made Tue 01 Feb 2022 15:14:24 GMT
# gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg: issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kwolf-gitlab/tags/for-upstream:
block/rbd: workaround for ceph issue #53784
block/rbd: fix handling of holes in .bdrv_co_block_status
qemu-img: Unify [-b [-F]] documentation
qsd: Document fuse's allow-other option
block.h: remove outdated comment
block/export/fuse: Fix build failure on FreeBSD
block/export/fuse: Rearrange if-else-if ladder in fuse_fallocate()
block/export: Fix vhost-user-blk shutdown with requests in flight
block: bdrv_set_backing_hd(): use drained section
qemu-storage-daemon: Fix typo in vhost-user-blk help
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'storage-daemon/qemu-storage-daemon.c')
| -rw-r--r-- | storage-daemon/qemu-storage-daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c index 9d76d1114d..504d33aa91 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -100,7 +100,7 @@ static void help(void) "\n" #ifdef CONFIG_FUSE " --export [type=]fuse,id=<id>,node-name=<node-name>,mountpoint=<file>\n" -" [,growable=on|off][,writable=on|off]\n" +" [,growable=on|off][,writable=on|off][,allow-other=on|off|auto]\n" " export the specified block node over FUSE\n" "\n" #endif /* CONFIG_FUSE */ @@ -111,7 +111,7 @@ static void help(void) " export the specified block node as a\n" " vhost-user-blk device over UNIX domain socket\n" " --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,\n" -" fd,addr.str=<fd>[,writable=on|off]\n" +" addr.type=fd,addr.str=<fd>[,writable=on|off]\n" " [,logical-block-size=<block-size>][,num-queues=<num-queues>]\n" " export the specified block node as a\n" " vhost-user-blk device over file descriptor\n" |