[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 02/17] qemu-img: Fix convert, amend error messages fo
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 02/17] qemu-img: Fix convert, amend error messages for unknown options |
Date: |
Mon, 16 Mar 2015 17:57:06 +0100 |
From: Markus Armbruster <address@hidden>
Message quality regressed in commit dc523cd.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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 5af6f45..82d9078 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 e70f983..5ec248f 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.
--
1.8.3.1
- [Qemu-block] [PULL 00/17] Block patches for 2.3.0-rc0, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 02/17] qemu-img: Fix convert, amend error messages for unknown options,
Kevin Wolf <=
- [Qemu-block] [PULL 03/17] block: Deprecate QCOW/QCOW2 encryption, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 01/17] iotests: Update 051's reference output, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 04/17] block: Fix block-set-write-threshold not to use funky error class, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 06/17] qcow2: Respect new_block in alloc_refcount_block(), Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 05/17] qemu-img: Avoid qerror_report_err() outside QMP handlers, again, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 09/17] monitor: Convert bdrv_find to blk_by_name, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 10/17] migration: Convert bdrv_find to blk_by_name, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 07/17] iotests: Add tests for refcount table growth, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 08/17] iotests: Test non-self-referential qcow2 refblocks, Kevin Wolf, 2015/03/16
- [Qemu-block] [PULL 11/17] blockdev: Convert bdrv_find to blk_by_name, Kevin Wolf, 2015/03/16