From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGWR9-0006cW-6s for qemu-devel@nongnu.org; Thu, 20 Feb 2014 11:25:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGWR2-0005RX-Lq for qemu-devel@nongnu.org; Thu, 20 Feb 2014 11:25:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGWR2-0005R6-DC for qemu-devel@nongnu.org; Thu, 20 Feb 2014 11:25:16 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1KGOJSm027213 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Feb 2014 11:25:12 -0500 Message-ID: <530626E8.1050504@redhat.com> Date: Thu, 20 Feb 2014 09:01:44 -0700 From: Eric Blake MIME-Version: 1.0 References: <1392908243-8835-1-git-send-email-kwolf@redhat.com> <1392908243-8835-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1392908243-8835-4-git-send-email-kwolf@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="STcF5ibG8me0ME0AKqcx7mQ4dw9bEjNN1" Subject: Re: [Qemu-devel] [PATCH v2 3/6] qemu-img convert: Support multiple -o options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-devel@nongnu.org Cc: famz@redhat.com, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --STcF5ibG8me0ME0AKqcx7mQ4dw9bEjNN1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 02/20/2014 07:57 AM, Kevin Wolf wrote: > Instead of ignoring all option values but the last one, multiple -o > options now have the same meaning as having a single option with all > settings in the order of their respective -o options. >=20 > Signed-off-by: Kevin Wolf > --- > qemu-img.c | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-) Same comment as in 2/6 about the surprise of a trailing comma empty option turning into a literal comma. > @@ -1191,13 +1194,21 @@ static int img_convert(int argc, char **argv) > case 'e': > error_report("option -e is deprecated, please use \'-o " > "encryption\' instead!"); > - return 1; > + ret =3D -1; > + goto out; I had to look, but the out: label does indeed turn a ret of -1 into a 'return 1' at the end of the day. Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --STcF5ibG8me0ME0AKqcx7mQ4dw9bEjNN1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTBiboAAoJEKeha0olJ0Nq1coH/iN1wWO/uhv6L3QNPp7Rvzn/ EbMeSu7XsCHqtt/jhtGigzF9IMxATxM34jEo2Dn9q2ez1Zu+c7G/vzMJ1s8nvJE8 oLoZ2vnbsrnk7htBszrQuQK2bbv4U1sx48Cshcn2YjLBpjri/fPueFC5Y6cT2eEP FMfJSaQs4ZL0Laip5J+xWJzaxWCBSVOMwMx6Rbxqc8uW9Ouv3X9cJqVOZOkz62GA tfJlyFZp8gtjAwnpO6Te6YdlGF1KSLUDdF322Z/s/x14ipu4X3aMYBNv5lQTfHww nIDK2vFWUFEQmBS6gc5/NW79B4Zjo9u4CpstwL5tuLh7Z7lTyywc88n1B+Ktpzo= =2P43 -----END PGP SIGNATURE----- --STcF5ibG8me0ME0AKqcx7mQ4dw9bEjNN1--