Re: [Qemu-devel] [PATCH 5/5] trace: enable tracing in qemu-img

["Denis V. Lunev" <den@openvz.org>]

On 06/03/2016 05:55 PM, Eric Blake wrote:
> On 06/02/2016 12:35 PM, Denis V. Lunev wrote:
>> The command will work this way:
>>      qemu-img --trace qcow2* create -f qcow2 1.img 64G
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> Suggested by: Daniel P. Berrange <berrange@redhat.com>
>> CC: Eric Blake <eblake@redhat.com>
>> CC: Paolo Bonzini <pbonzini@redhat.com>
>> CC: Stefan Hajnoczi <stefanha@redhat.com>
>> CC: Kevin Wolf <kwolf@redhat.com>
>> ---
>>   qemu-img.c    | 24 +++++++++++++++++++++---
>>   qemu-img.texi | 34 +++++++++++++++++++++++++++++++++-
>>   2 files changed, 54 insertions(+), 4 deletions(-)
>>
>> @@ -87,7 +89,7 @@ static void QEMU_NORETURN help(void)
>>   {
>>       const char *help_msg =
>>              QEMU_IMG_VERSION
>> -           "usage: qemu-img command [command options]\n"
>> +           "usage: qemu-img [common options] command [command options]\n"
>>              "QEMU disk image utility\n"
> This hunk belongs in the previous patch
>
>>              "\n"
>>              "Command syntax:\n"
>> @@ -156,10 +158,14 @@ static void QEMU_NORETURN help(void)
>>              "  '-f' first image format\n"
>>              "  '-F' second image format\n"
>>              "  '-s' run in Strict mode - fail on different image size or sector allocation\n";
>> +    const char *help_msg2 =
>> +           "Common options:\n"
>> +           "  '-T', --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
>> +           "       specify tracing options\n";
> Part of this hunk belongs in the previous patch, along with mention of
> -h/--help as a common option moved up to this area, and adding mention
> of -v/--version (once you fix -v to actually work).
>
>
>> +++ b/qemu-img.texi
>> @@ -1,6 +1,6 @@
>>   @example
>>   @c man begin SYNOPSIS
>> -@command{qemu-img} @var{command} [@var{command} @var{options}]
>> +@command{qemu-img} [@var{common} @var{options}] @var{command} [@var{command} @var{options}]
> Again, this hunk belongs in the previous commit.
>
>>   @c man end
>>   @end example
>>   
>> @@ -16,6 +16,38 @@ inconsistent state.
>>   
>>   @c man begin OPTIONS
>>   
>> +Common options:
>> +@table @option
>> +@item -T, --trace [events=@var{file}][,file=@var{file}]
> As in patch 3, why does this synopsis vary from the --help output?
same mistake, have tossed these bits several times. Will fix.

> Rather than duplicating the same text in multiple .texi files, should we
> put the text in a single sub-file then use inclusion to pull it in? That
> way, if we ever tweak the common option parsing for --trace, updating
> the one sub-file will update all 3 man pages (qemu, qemu-img, qemu-nbd).
>
thanks a lot for a review!