diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2011-02-09 11:25:53 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-02-11 14:34:01 +0100 |
| commit | 038a866f8153c45499b80162f8e1b7188620bd8a (patch) | |
| tree | 6615962fb762411d44dcda3a9a6cee3e949390e3 | |
| parent | 64a216f58edc1c6d34b728c618342aae2493241a (diff) | |
| download | qemu-038a866f8153c45499b80162f8e1b7188620bd8a.tar.gz | |
qemu-img: Improve error messages for failed bdrv_open
Output the error message string of the bdrv_open return code. Also set a
non-empty device name for the images because the unknown feature error message
includes it.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit b9eaf9ecb15a9c69a592f386159163d5efc3b919)
| -rw-r--r-- | qemu-img.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qemu-img.c b/qemu-img.c index 4a3735811c..7e3cc4cbd5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -213,8 +213,9 @@ static BlockDriverState *bdrv_new_open(const char *filename, BlockDriverState *bs; BlockDriver *drv; char password[256]; + int ret; - bs = bdrv_new(""); + bs = bdrv_new("image"); if (fmt) { drv = bdrv_find_format(fmt); @@ -225,10 +226,13 @@ static BlockDriverState *bdrv_new_open(const char *filename, } else { drv = NULL; } - if (bdrv_open(bs, filename, flags, drv) < 0) { - error_report("Could not open '%s'", filename); + + ret = bdrv_open(bs, filename, flags, drv); + if (ret < 0) { + error_report("Could not open '%s': %s", filename, strerror(-ret)); goto fail; } + if (bdrv_is_encrypted(bs)) { printf("Disk image '%s' is encrypted.\n", filename); if (read_password(password, sizeof(password)) < 0) { |