File Revert-qemu-img-Improve-error-for-rebase.patch of Package qemu

Overview Repositories Revisions Requests Users Attributes Meta

File Revert-qemu-img-Improve-error-for-rebase.patch of Package qemu (Revision 8da59c9c3853bac26fad2fee83f42cf5)

Currently displaying revision 8da59c9c3853bac26fad2fee83f42cf5 , Show latest

From: "Jose R. Ziviani" <jziviani@suse.de>
Date: Thu, 2 Sep 2021 16:06:20 -0300
Subject: Revert "qemu-img: Improve error for rebase without backing format"

This reverts commit a7cd44bef3d9380181734a93977c3d1df3eef2cf.
References: bsc#1190135

Signed-off-by: Jose R Ziviani <jose.ziviani@suse.com>
---
 qemu-img.c                 | 3 ---
 tests/qemu-iotests/114.out | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index 908fd0cce5b4fc90a4798ea4a1c4..3ebd09245290878c24c8f1412146 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3810,9 +3810,6 @@ static int img_rebase(int argc, char **argv)
     if (ret == -ENOSPC) {
         error_report("Could not change the backing file to '%s': No "
                      "space left in the file header", out_baseimg);
-    } else if (ret == -EINVAL && out_baseimg && !out_basefmt) {
-        error_report("Could not change the backing file to '%s': backing "
-                     "format must be specified", out_baseimg);
     } else if (ret < 0) {
         error_report("Could not change the backing file to '%s': %s",
             out_baseimg, strerror(-ret));
diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
index f51dd9d20a1038c54d7d6e073b5e..6d638da266e495e8bed2fbcf919e 100644
--- a/tests/qemu-iotests/114.out
+++ b/tests/qemu-iotests/114.out
@@ -14,7 +14,7 @@ qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknow
 no file open, try 'help open'
 read 4096/4096 bytes at offset 0
 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-qemu-img: Could not change the backing file to 'TEST_DIR/t.qcow2.base': backing format must be specified
+qemu-img: Could not change the backing file to 'TEST_DIR/t.qcow2.base': Invalid argument
 read 4096/4096 bytes at offset 0
 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 *** done

Places

File Revert-qemu-img-Improve-error-for-rebase.patch of Package qemu (Revision 8da59c9c3853bac26fad2fee83f42cf5)

Places