From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=48362 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PPXR6-0005f7-Rd
	for qemu-devel@nongnu.org; Mon, 06 Dec 2010 04:32:46 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1PPXR5-0007oE-L1
	for qemu-devel@nongnu.org; Mon, 06 Dec 2010 04:32:44 -0500
Received: from mail-ww0-f53.google.com ([74.125.82.53]:47032)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1PPXR5-0007o9-C6
	for qemu-devel@nongnu.org; Mon, 06 Dec 2010 04:32:43 -0500
Received: by wwi18 with SMTP id 18so6083872wwi.10
	for <qemu-devel@nongnu.org>; Mon, 06 Dec 2010 01:32:42 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <1291623456-3826-2-git-send-email-Jes.Sorensen@redhat.com>
References: <1291623456-3826-1-git-send-email-Jes.Sorensen@redhat.com>
	<1291623456-3826-2-git-send-email-Jes.Sorensen@redhat.com>
Date: Mon, 6 Dec 2010 09:32:42 +0000
Message-ID: <AANLkTimO_aOetTUXCEUHjF_MciK31=-pzFDZF==Ew5ah@mail.gmail.com>
Subject: Re: [Qemu-devel] [PATCH 1/3] Consolidate printing of block driver
	options
From: Stefan Hajnoczi <stefanha@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
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: Jes.Sorensen@redhat.com
Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, qemu-devel@nongnu.org

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)
>
> =A0 =A0 out_filename =3D argv[argc - 1];
>
> + =A0 =A0if (options && !strcmp(options, "?")) {
> + =A0 =A0 =A0 =A0ret =3D print_block_option_help(out_filename, out_fmt);
> + =A0 =A0 =A0 =A0goto out2;
> + =A0 =A0}
> +
> =A0 =A0 if (bs_n > 1 && out_baseimg) {
> =A0 =A0 =A0 =A0 error("-B makes no sense when concatenating multiple inpu=
t images");
> =A0 =A0 =A0 =A0 return 1;

Why goto out2 and not just return like the bs > 1 && out_baseimg check?

Stefan