Re: [PULL 15/18] qemu-img: adds option to use aio engine for benchmarking

[Peter Maydell]

On Thu, 30 Jan 2020 at 21:32, Stefan Hajnoczi <address@hidden> wrote:
>
> From: Aarushi Mehta <address@hidden>
>
> Signed-off-by: Aarushi Mehta <address@hidden>
> Acked-by: Stefano Garzarella <address@hidden>
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> Message-id: address@hidden
> Message-Id: <address@hidden>
> Signed-off-by: Stefan Hajnoczi <address@hidden>

> --- a/qemu-img-cmds.hx
> +++ b/qemu-img-cmds.hx
> @@ -20,9 +20,9 @@ STEXI
>  ETEXI
>
>  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] [-w] [-U] filename")
> +    "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")
>  STEXI
> -@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] 
> [--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] 
> [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] 
> [-t @var{cache}] [-w] [-U] @var{filename}
> +@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] 
> [--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] 
> [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] 
> [-t @var{cache}] [-i @var{aio}] [-w] [-U] @var{filename}
>  ETEXI

> diff --git a/qemu-img.texi b/qemu-img.texi
> index b5156d6316..20136fcb94 100644
> --- a/qemu-img.texi
> +++ b/qemu-img.texi
> @@ -206,7 +206,7 @@ Command description:
>  Amends the image format specific @var{options} for the image file
>  @var{filename}. Not all file formats support this operation.
>
> -@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] 
> [--flush-interval=@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] 
> [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] 
> [-t @var{cache}] [-w] [-U] @var{filename}
> +@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] 
> [--flush-interval=@var{flush_interval}] [-n] [-i @var{aio}] [--no-drain] [-o 
> @var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S 
> @var{step_size}] [-t @var{cache}] [-w] [-U] @var{filename}

Is there a reason why the new '-i aio' option is added to the synopsis
line after '-t cache' in the DEF() line and the STEXI/ETEXI fragment,
but after '-n' in the line in the qemu-img.texi file ?

All the other options here are in alphabetical order, so logically
'-i aio' should go in neither of those two places but after
'--flush-interval'...

(This change is a conflict with the in-flight qemu-img conversion
to rST; to fix that up I'm going to just change the rST conversion
to exactly follow the texi here; we can fix the option ordering
as a followup patch.)

thanks
-- PMM