[Qemu-devel] [PATCH 0/2] Unbreak qemu-img error messages and iotests

[Qemu-devel] [PATCH 0/2] Unbreak qemu-img error messages and iotests

[Markus Armbruster]

"check -T -qcow2" now passes again.  Sorry for the mess I made.

Markus Armbruster (2):
  iotests: Update 051's reference output
  qemu-img: Fix convert, amend error messages for unknown options

 qemu-img.c                 | 6 ++----
 tests/qemu-iotests/051.out | 4 +---
 tests/qemu-iotests/061.out | 1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

-- 
1.9.3

[Qemu-devel] [PATCH 1/2] iotests: Update 051's reference output

[Markus Armbruster]

Commit c4bacaf improved error reporting, but neglected to update
051.out.  Commit 2726958 tried to redress, but didn't get it quite
right (punctuation difference), and shortly after commit
ae071cc..master improved error reporting some more, neglecting 051.out
some more.  Sorry!

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 tests/qemu-iotests/051.out | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 09895e6..2890eac 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -128,13 +128,11 @@ QEMU_PROG: Initialization of device ide-hd failed: Device initialization failed.
 Testing: -drive if=virtio
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
-QEMU_PROG: -drive if=virtio: Device initialization failed.
 QEMU_PROG: -drive if=virtio: Device 'virtio-blk-pci' could not be initialized
 
 Testing: -drive if=scsi
 QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
-QEMU_PROG: Initialization of device lsi53c895a failed: Device initialization failed.
+(qemu) QEMU_PROG: Initialization of device lsi53c895a failed: Device needs media, but drive is empty
 
 Testing: -drive if=none,id=disk -device ide-cd,drive=disk
 QEMU X.Y.Z monitor - type 'help' for more information
-- 
1.9.3

[Qemu-devel] [PATCH 2/2] qemu-img: Fix convert, amend error messages for unknown options

[Markus Armbruster]

Message quality regressed in commit dc523cd.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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.9.3

Re: [Qemu-devel] [PATCH 0/2] Unbreak qemu-img error messages and iotests

[Kevin Wolf]

Am 14.03.2015 um 10:23 hat Markus Armbruster geschrieben:
> "check -T -qcow2" now passes again.  Sorry for the mess I made.
> 
> Markus Armbruster (2):
>   iotests: Update 051's reference output
>   qemu-img: Fix convert, amend error messages for unknown options

Thanks, applied to the block branch.

Kevin