From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=58576 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PPYBq-0002Xh-Ra
	for qemu-devel@nongnu.org; Mon, 06 Dec 2010 05:21:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Jes.Sorensen@redhat.com>) id 1PPYBp-0005tM-Vd
	for qemu-devel@nongnu.org; Mon, 06 Dec 2010 05:21:02 -0500
Received: from mx1.redhat.com ([209.132.183.28]:37850)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Jes.Sorensen@redhat.com>) id 1PPYBp-0005t8-Ox
	for qemu-devel@nongnu.org; Mon, 06 Dec 2010 05:21:01 -0500
Message-ID: <4CFCB908.8070805@redhat.com>
Date: Mon, 06 Dec 2010 11:20:56 +0100
From: Jes Sorensen <Jes.Sorensen@redhat.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 1/3] Consolidate printing of block driver
	options
References: <1291623456-3826-1-git-send-email-Jes.Sorensen@redhat.com>	<1291623456-3826-2-git-send-email-Jes.Sorensen@redhat.com>
	<AANLkTimO_aOetTUXCEUHjF_MciK31=-pzFDZF==Ew5ah@mail.gmail.com>
In-Reply-To: <AANLkTimO_aOetTUXCEUHjF_MciK31=-pzFDZF==Ew5ah@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@gmail.com>
Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, qemu-devel@nongnu.org

On 12/06/10 10:32, Stefan Hajnoczi wrote:
> On Mon, Dec 6, 2010 at 8:17 AM,  <Jes.Sorensen@redhat.com> wrote:
>> @@ -694,6 +721,11 @@ static int img_convert(int argc, char **argv)
>>
>>     out_filename = argv[argc - 1];
>>
>> +    if (options && !strcmp(options, "?")) {
>> +        ret = print_block_option_help(out_filename, out_fmt);
>> +        goto out2;
>> +    }
>> +
>>     if (bs_n > 1 && out_baseimg) {
>>         error("-B makes no sense when concatenating multiple input images");
>>         return 1;
> 
> Why goto out2 and not just return like the bs > 1 && out_baseimg check?

It is cleaner, I'd rather convert the bs_n test to do it too.

Cheers,
Jes