diff options
| author | Eric Blake <eblake@redhat.com> | 2021-07-08 10:52:28 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-07-09 13:19:09 +0200 |
| commit | a7cd44bef3d9380181734a93977c3d1df3eef2cf (patch) | |
| tree | b8b49470b14ac797041c137b0d8f38fae444023f | |
| parent | 497a30dbb065937d67f6c43af6dd78492e1d6f6d (diff) | |
| download | focaccia-qemu-a7cd44bef3d9380181734a93977c3d1df3eef2cf.tar.gz focaccia-qemu-a7cd44bef3d9380181734a93977c3d1df3eef2cf.zip | |
qemu-img: Improve error for rebase without backing format
When removeing support for qemu-img being able to create backing chains without embedded backing formats, we caused a poor error message as caught by iotest 114. Improve the situation to inform the user what went wrong. Suggested-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <20210708155228.2666172-1-eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | qemu-img.c | 3 | ||||
| -rw-r--r-- | tests/qemu-iotests/114.out | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c index ec0e2fabe5..7c4fc60312 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3767,6 +3767,9 @@ 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 6d638da266..f51dd9d20a 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': Invalid argument +qemu-img: Could not change the backing file to 'TEST_DIR/t.qcow2.base': backing format must be specified read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done |