Commit b9eaf9ec authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 10b758e8

qemu-img.c

+7 −3
Original line number Diff line number Diff line
@@ -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) {