From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoFvC-0004SA-Gw for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:12:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoFv7-0000fw-Ew for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:12:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48047) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoFv7-0000fr-7d for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:12:01 -0500 Message-ID: <5462515E.5000601@redhat.com> Date: Tue, 11 Nov 2014 11:11:42 -0700 From: Eric Blake MIME-Version: 1.0 References: <1415627159-15941-1-git-send-email-mreitz@redhat.com> <1415627159-15941-15-git-send-email-mreitz@redhat.com> In-Reply-To: <1415627159-15941-15-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="r17K2Aq3VMn69v5t8wFiOG9LUWdlAk19q" Subject: Re: [Qemu-devel] [PATCH 14/21] qcow2: Use error_report() in qcow2_amend_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Stefan Hajnoczi This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --r17K2Aq3VMn69v5t8wFiOG9LUWdlAk19q Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/10/2014 06:45 AM, Max Reitz wrote: > Signed-off-by: Max Reitz > --- > block/qcow2.c | 14 ++++++-------- > tests/qemu-iotests/061.out | 14 +++++++------- > 2 files changed, 13 insertions(+), 15 deletions(-) >=20 > diff --git a/block/qcow2.c b/block/qcow2.c > index 21a1883..beb7187 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -2686,11 +2686,11 @@ static int qcow2_amend_options(BlockDriverState= *bs, QemuOpts *opts, > } else if (!strcmp(compat, "1.1")) { > new_version =3D 3; > } else { > - fprintf(stderr, "Unknown compatibility level %s.\n", c= ompat); > + error_report("Unknown compatibility level %s.", compat= ); Not many error_report() locations include a trailing '.' > +++ b/tests/qemu-iotests/061.out > @@ -281,19 +281,19 @@ No errors were found on the image. > =3D=3D=3D Testing invalid configurations =3D=3D=3D > =20 > Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864=20 > -Lazy refcounts only supported with compatibility level 1.1 and above (= use compat=3D1.1 or greater) > +qemu-img: Lazy refcounts only supported with compatibility level 1.1 a= nd above (use compat=3D1.1 or greater) > qemu-img: Error while amending options: Invalid argument > -Lazy refcounts only supported with compatibility level 1.1 and above (= use compat=3D1.1 or greater) > +qemu-img: Lazy refcounts only supported with compatibility level 1.1 a= nd above (use compat=3D1.1 or greater) > qemu-img: Error while amending options: Invalid argument > -Unknown compatibility level 0.42. > +qemu-img: Unknown compatibility level 0.42. > qemu-img: Error while amending options: Invalid argument > qemu-img: Invalid parameter 'foo' > qemu-img: Invalid options for file format 'qcow2' > -Changing the cluster size is not supported. > +qemu-img: Changing the cluster size is not supported. > qemu-img: Error while amending options: Operation not supported > -Changing the encryption flag is not supported. > +qemu-img: Changing the encryption flag is not supported. > qemu-img: Error while amending options: Operation not supported > -Cannot change preallocation mode. > +qemu-img: Cannot change preallocation mode. > qemu-img: Error while amending options: Operation not supported See - most of the messages do not end in '.'. Probably worth cleaning up if you respin. But it's not a show-stopper if you leave it, so: Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --r17K2Aq3VMn69v5t8wFiOG9LUWdlAk19q 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 iQEcBAEBCAAGBQJUYlFeAAoJEKeha0olJ0Nq6acH/jYA2EgNOym+OU/r1YujtU+a uoLD19VNl3LO8SSZk4Kd5WaJtmNme3SWmO9AvXLJwvNDoqwPhbqL5E5pjZ+/w0NV dHmrsJy9s+WpgvV1gt+B8qbPkQ68sFwWz3q/JqhhfzGI5d/krtUhhuI0h8U9KaI8 xmGuOu5IjGl68DMwWoWXW39M87A5ZqHa4LptZSA539Plrc7qDX9KlXr6Pu16QT7T TkK7L1+/oNeZa46uDIWtfkuL0p3hoIRPbxbcSnc0yXZ28Lh10hBWYp5bRYOc5AXo UZxJuZGmPevCtL915XD8gqbtmqhaAtTj1Flcym7tiPjc+pt1eyJJt4WB7fGzCAk= =KACv -----END PGP SIGNATURE----- --r17K2Aq3VMn69v5t8wFiOG9LUWdlAk19q--