From 97a2ca7ae6bccb78b2acf10d6d3eebd1e9f3bbdc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 14 Mar 2015 10:23:15 +0100 Subject: [PATCH] qemu-img: Fix convert, amend error messages for unknown options Message quality regressed in commit dc523cd. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- qemu-img.c | 6 ++---- tests/qemu-iotests/061.out | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 5af6f455df..82d907801e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1554,8 +1554,7 @@ static int img_convert(int argc, char **argv) if (options) { qemu_opts_do_parse(opts, options, NULL, &local_err); if (local_err) { - error_report("Invalid options for file format '%s'", out_fmt); - error_free(local_err); + error_report_err(local_err); ret = -1; goto out; } @@ -3001,8 +3000,7 @@ static int img_amend(int argc, char **argv) if (options) { qemu_opts_do_parse(opts, options, NULL, &err); if (err) { - error_report("Invalid options for file format '%s'", fmt); - error_free(err); + error_report_err(err); ret = -1; goto out; } diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index e70f9834d8..5ec248f79b 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -288,7 +288,6 @@ qemu-img: Error while amending options: Invalid argument 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: Error while amending options: Operation not supported Changing the encryption flag is not supported.