From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8qYb-0001a5-O2 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 10:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8qYX-0002oC-J6 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 10:58:40 -0400 References: <1464892545-26544-1-git-send-email-den@openvz.org> <1464892545-26544-6-git-send-email-den@openvz.org> <57519A56.1090102@redhat.com> From: "Denis V. Lunev" Message-ID: <57519B16.2000405@openvz.org> Date: Fri, 3 Jun 2016 17:58:30 +0300 MIME-Version: 1.0 In-Reply-To: <57519A56.1090102@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 5/5] trace: enable tracing in qemu-img List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , Kevin Wolf 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 >> Suggested by: Daniel P. Berrange >> CC: Eric Blake >> CC: Paolo Bonzini >> CC: Stefan Hajnoczi >> CC: Kevin Wolf >> --- >> 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=]][,events=][,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!