summaryrefslogtreecommitdiffstats
path: root/block.c
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2013-11-08 11:26:49 +0800
committerKevin Wolf <kwolf@redhat.com>2013-11-14 13:09:06 +0100
commitb04b6b6ec3a1e0ba90c2f58617286d9fc35fa372 (patch)
tree3a02580b238e0f85eb5443eb4b7011d7d7fa4169 /block.c
parent5c5432e7d630592ddcc1876ac8a1505f8f14ef15 (diff)
downloadhqemu-b04b6b6ec3a1e0ba90c2f58617286d9fc35fa372.zip
hqemu-b04b6b6ec3a1e0ba90c2f58617286d9fc35fa372.tar.gz
block: Print its file name if backing file opening failed
If backing file doesn't exist, the error message is confusing and misleading: $ qemu /tmp/a.qcow2 qemu: could not open disk image /tmp/a.qcow2: Could not open file: No such file or directory But... $ ls /tmp/a.qcow2 /tmp/a.qcow2 $ qemu-img info /tmp/a.qcow2 image: /tmp/a.qcow2 file format: qcow2 virtual size: 8.0G (8589934592 bytes) disk size: 196K cluster_size: 65536 backing file: /tmp/b.qcow2 Because... $ ls /tmp/b.qcow2 ls: cannot access /tmp/b.qcow2: No such file or directory This is not intuitive. It's better to have the missing file's name in the error message. With this patch: $ qemu-io -c 'read 0 512' /tmp/a.qcow2 qemu-io: can't open device /tmp/a.qcow2: Could not open backing file: Could not open '/stor/vm/arch.raw': No such file or directory no file open, try 'help open' Which is a little bit better. Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block.c b/block.c
index 6d5c804..38078f7 100644
--- a/block.c
+++ b/block.c
@@ -1009,7 +1009,9 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
bdrv_unref(bs->backing_hd);
bs->backing_hd = NULL;
bs->open_flags |= BDRV_O_NO_BACKING;
- error_propagate(errp, local_err);
+ error_setg(errp, "Could not open backing file: %s",
+ error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
pstrcpy(bs->backing_file, sizeof(bs->backing_file),
OpenPOWER on IntegriCloud