From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoTah-0001O8-4F for qemu-devel@nongnu.org; Wed, 12 Nov 2014 03:47:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoTaa-0008JY-Vz for qemu-devel@nongnu.org; Wed, 12 Nov 2014 03:47:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoTaa-0008JP-MD for qemu-devel@nongnu.org; Wed, 12 Nov 2014 03:47:44 -0500 Message-ID: <54631EA9.5060701@redhat.com> Date: Wed, 12 Nov 2014 09:47:37 +0100 From: Max Reitz MIME-Version: 1.0 References: <1415627159-15941-1-git-send-email-mreitz@redhat.com> <1415627159-15941-15-git-send-email-mreitz@redhat.com> <5462515E.5000601@redhat.com> In-Reply-To: <5462515E.5000601@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit 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: Eric Blake , qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Stefan Hajnoczi On 2014-11-11 at 19:11, Eric Blake wrote: > 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(-) >> >> 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 = 3; >> } else { >> - fprintf(stderr, "Unknown compatibility level %s.\n", compat); >> + 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. >> === Testing invalid configurations === >> >> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 >> -Lazy refcounts only supported with compatibility level 1.1 and above (use compat=1.1 or greater) >> +qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above (use compat=1.1 or greater) >> qemu-img: Error while amending options: Invalid argument >> -Lazy refcounts only supported with compatibility level 1.1 and above (use compat=1.1 or greater) >> +qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above (use compat=1.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: I'll clean it up. Max > Reviewed-by: Eric Blake