SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qemu-img: Place the '-i aio' option in alphabetical order

Browse Source 
The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it
after '--flush-interval'.

Signed-off-by: Julia Suvorova <jusual@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20200205163008.204493-1-jusual@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Julia Suvorova 2020-02-05 17:30:08 +01:00 committed by Laurent Vivier
parent 60f9a4ef7e
commit 890fb1f6b3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/interop/qemu-img.rst
View File

@ -247,7 +247,7 @@ Command description:
Amends the image format specific *OPTIONS* for the image file Amends the image format specific *OPTIONS* for the image file
*FILENAME*. Not all file formats support this operation. *FILENAME*. Not all file formats support this operation.
.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-n] [-i AIO] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME .. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-i AIO] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME
Run a simple sequential I/O benchmark on the specified image. If ``-w`` is Run a simple sequential I/O benchmark on the specified image. If ``-w`` is
specified, a write test is performed, otherwise a read test is performed. specified, a write test is performed, otherwise a read test is performed.
@ -264,13 +264,13 @@ Command description:
``--no-drain`` is specified, a flush is issued without draining the request ``--no-drain`` is specified, a flush is issued without draining the request
queue first. queue first.
if ``-i`` is specified, *AIO* option can be used to specify different
AIO backends: ``threads``, ``native`` or ``io_uring``.
If ``-n`` is specified, the native AIO backend is used if possible. On If ``-n`` is specified, the native AIO backend is used if possible. On
Linux, this option only works if ``-t none`` or ``-t directsync`` is Linux, this option only works if ``-t none`` or ``-t directsync`` is
specified as well. specified as well.
if ``-i`` is specified, *AIO* option can be used to specify different
AIO backends: ``threads``, ``native`` or ``io_uring``.
For write tests, by default a buffer filled with zeros is written. This can be For write tests, by default a buffer filled with zeros is written. This can be
overridden with a pattern byte specified by *PATTERN*. overridden with a pattern byte specified by *PATTERN*.

4
qemu-img-cmds.hx
View File

@ -16,9 +16,9 @@ SRST
ERST ERST
DEF("bench", img_bench, DEF("bench", img_bench,
"bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval] [-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S step_size] [-t cache] [-i aio] [-w] [-U] filename") "bench [-c count] [-d depth] [-f fmt] [--flush-interval=flush_interval] [-i aio] [-n] [--no-drain] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S step_size] [-t cache] [-w] [-U] filename")
SRST SRST
.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-i AIO] [-w] [-U] FILENAME .. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-i AIO] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME
ERST ERST
DEF("check", img_check, DEF("check", img_check,
"check [--object objectdef] [--image-opts] [-q] [-f fmt] [--output=ofmt] [-r [leaks | all]] [-T src_cache] [-U] filename") "check [--object objectdef] [--image-opts] [-q] [-f fmt] [--output=ofmt] [-r [leaks | all]] [-T src_cache] [-U] filename")