diff mbox series

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

Message ID 20200205163008.204493-1-jusual@redhat.com (mailing list archive)
State New, archived
Headers show
Series qemu-img: Place the '-i aio' option in alphabetical order | expand

Commit Message

Julia Suvorova Feb. 5, 2020, 4:30 p.m. UTC
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(-)

Comments

Eric Blake Feb. 5, 2020, 4:40 p.m. UTC | #1
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>
Philippe Mathieu-Daudé Feb. 5, 2020, 5:17 p.m. UTC | #2
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>
Stefan Hajnoczi Feb. 6, 2020, 7:01 a.m. UTC | #3
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>
Laurent Vivier Feb. 6, 2020, 10:10 a.m. UTC | #4
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
diff mbox series

Patch

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")