Re: [Qemu-devel] [PATCH 14/21] qcow2: Use error_report() in qcow2_amend_options()

[Max Reitz <mreitz@redhat.com>]

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 <mreitz@redhat.com>
>> ---
>>   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 <eblake@redhat.com>