* [PATCH] qemu-img: Place the '-i aio' option in alphabetical order
@ 2020-02-05 16:30 Julia Suvorova
2020-02-05 16:40 ` Eric Blake
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Julia Suvorova @ 2020-02-05 16:30 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Julia Suvorova, Stefan Hajnoczi
The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it
after '--flush-interval'.
Signed-off-by: Julia Suvorova <jusual@redhat.com>
---
docs/interop/qemu-img.rst | 8 ++++----
qemu-img-cmds.hx | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/interop/qemu-img.rst b/docs/interop/qemu-img.rst
index fa27e5c7b4..42e4451db4 100644
--- a/docs/interop/qemu-img.rst
+++ b/docs/interop/qemu-img.rst
@@ -247,7 +247,7 @@ Command description:
Amends the image format specific *OPTIONS* for the image file
*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
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
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
Linux, this option only works if ``-t none`` or ``-t directsync`` is
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
overridden with a pattern byte specified by *PATTERN*.
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index 3fd836ca90..d7fbc6b1f4 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -16,9 +16,9 @@ SRST
ERST
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
-.. 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
DEF("check", img_check,
"check [--object objectdef] [--image-opts] [-q] [-f fmt] [--output=ofmt] [-r [leaks | all]] [-T src_cache] [-U] filename")
--
2.24.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] qemu-img: Place the '-i aio' option in alphabetical order
2020-02-05 16:30 [PATCH] qemu-img: Place the '-i aio' option in alphabetical order Julia Suvorova
@ 2020-02-05 16:40 ` Eric Blake
2020-02-05 17:17 ` Philippe Mathieu-Daudé
2020-02-06 7:01 ` Stefan Hajnoczi
2 siblings, 0 replies; 5+ messages in thread
From: Eric Blake @ 2020-02-05 16:40 UTC (permalink / raw)
To: Julia Suvorova, qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
On 2/5/20 10:30 AM, Julia Suvorova wrote:
> The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it
> after '--flush-interval'.
>
> Signed-off-by: Julia Suvorova <jusual@redhat.com>
> ---
> docs/interop/qemu-img.rst | 8 ++++----
> qemu-img-cmds.hx | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qemu-img: Place the '-i aio' option in alphabetical order
2020-02-05 16:30 [PATCH] qemu-img: Place the '-i aio' option in alphabetical order Julia Suvorova
2020-02-05 16:40 ` Eric Blake
@ 2020-02-05 17:17 ` Philippe Mathieu-Daudé
2020-02-06 10:10 ` Laurent Vivier
2020-02-06 7:01 ` Stefan Hajnoczi
2 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-05 17:17 UTC (permalink / raw)
To: Julia Suvorova, qemu-devel; +Cc: QEMU Trivial, Peter Maydell, Stefan Hajnoczi
Cc'ing qemu-trivial@
On 2/5/20 5:30 PM, Julia Suvorova wrote:
> The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it
> after '--flush-interval'.
>
> Signed-off-by: Julia Suvorova <jusual@redhat.com>
> ---
> docs/interop/qemu-img.rst | 8 ++++----
> qemu-img-cmds.hx | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/docs/interop/qemu-img.rst b/docs/interop/qemu-img.rst
> index fa27e5c7b4..42e4451db4 100644
> --- a/docs/interop/qemu-img.rst
> +++ b/docs/interop/qemu-img.rst
> @@ -247,7 +247,7 @@ Command description:
> Amends the image format specific *OPTIONS* for the image file
> *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
> 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
> 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
> Linux, this option only works if ``-t none`` or ``-t directsync`` is
> 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
> overridden with a pattern byte specified by *PATTERN*.
>
> diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
> index 3fd836ca90..d7fbc6b1f4 100644
> --- a/qemu-img-cmds.hx
> +++ b/qemu-img-cmds.hx
> @@ -16,9 +16,9 @@ SRST
> ERST
>
> 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
> -.. 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
> DEF("check", img_check,
> "check [--object objectdef] [--image-opts] [-q] [-f fmt] [--output=ofmt] [-r [leaks | all]] [-T src_cache] [-U] filename")
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] qemu-img: Place the '-i aio' option in alphabetical order
2020-02-05 17:17 ` Philippe Mathieu-Daudé
@ 2020-02-06 10:10 ` Laurent Vivier
0 siblings, 0 replies; 5+ messages in thread
From: Laurent Vivier @ 2020-02-06 10:10 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Julia Suvorova, qemu-devel
Cc: QEMU Trivial, Peter Maydell, Stefan Hajnoczi
Le 05/02/2020 à 18:17, Philippe Mathieu-Daudé a écrit :
> Cc'ing qemu-trivial@
>
> On 2/5/20 5:30 PM, Julia Suvorova wrote:
>> The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it
>> after '--flush-interval'.
>>
>> Signed-off-by: Julia Suvorova <jusual@redhat.com>
>> ---
>> docs/interop/qemu-img.rst | 8 ++++----
>> qemu-img-cmds.hx | 4 ++--
>> 2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/docs/interop/qemu-img.rst b/docs/interop/qemu-img.rst
>> index fa27e5c7b4..42e4451db4 100644
>> --- a/docs/interop/qemu-img.rst
>> +++ b/docs/interop/qemu-img.rst
>> @@ -247,7 +247,7 @@ Command description:
>> Amends the image format specific *OPTIONS* for the image file
>> *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
>> 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
>> 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
>> Linux, this option only works if ``-t none`` or ``-t directsync`` is
>> 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
>> overridden with a pattern byte specified by *PATTERN*.
>> diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
>> index 3fd836ca90..d7fbc6b1f4 100644
>> --- a/qemu-img-cmds.hx
>> +++ b/qemu-img-cmds.hx
>> @@ -16,9 +16,9 @@ SRST
>> ERST
>> 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
>> -.. 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
>> DEF("check", img_check,
>> "check [--object objectdef] [--image-opts] [-q] [-f fmt]
>> [--output=ofmt] [-r [leaks | all]] [-T src_cache] [-U] filename")
>>
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qemu-img: Place the '-i aio' option in alphabetical order
2020-02-05 16:30 [PATCH] qemu-img: Place the '-i aio' option in alphabetical order Julia Suvorova
2020-02-05 16:40 ` Eric Blake
2020-02-05 17:17 ` Philippe Mathieu-Daudé
@ 2020-02-06 7:01 ` Stefan Hajnoczi
2 siblings, 0 replies; 5+ messages in thread
From: Stefan Hajnoczi @ 2020-02-06 7:01 UTC (permalink / raw)
To: Julia Suvorova
Cc: Kevin Wolf, Peter Maydell, qemu-devel, qemu-block, Max Reitz
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
On Wed, Feb 05, 2020 at 05:30:08PM +0100, Julia Suvorova wrote:
> The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it
> after '--flush-interval'.
>
> Signed-off-by: Julia Suvorova <jusual@redhat.com>
> ---
> docs/interop/qemu-img.rst | 8 ++++----
> qemu-img-cmds.hx | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-06 10:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-05 16:30 [PATCH] qemu-img: Place the '-i aio' option in alphabetical order Julia Suvorova
2020-02-05 16:40 ` Eric Blake
2020-02-05 17:17 ` Philippe Mathieu-Daudé
2020-02-06 10:10 ` Laurent Vivier
2020-02-06 7:01 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).