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 /qemu-img-cmds.hx | |
| 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 'qemu-img-cmds.hx')
| -rw-r--r-- | qemu-img-cmds.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 72bcdcfbfa..1b1dab5b17 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -52,9 +52,9 @@ SRST ERST DEF("create", img_create, - "create [--object objectdef] [-q] [-f fmt] [-b backing_file] [-F backing_fmt] [-u] [-o options] filename [size]") + "create [--object objectdef] [-q] [-f fmt] [-b backing_file [-F backing_fmt]] [-u] [-o options] filename [size]") SRST -.. option:: create [--object OBJECTDEF] [-q] [-f FMT] [-b BACKING_FILE] [-F BACKING_FMT] [-u] [-o OPTIONS] FILENAME [SIZE] +.. option:: create [--object OBJECTDEF] [-q] [-f FMT] [-b BACKING_FILE [-F BACKING_FMT]] [-u] [-o OPTIONS] FILENAME [SIZE] ERST DEF("dd", img_dd, |