Commit 76abe407 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

block: do not abuse EMEDIUMTYPE 



Returning "Wrong medium type" for an image that does not have a valid
header is a bit weird.  Improve the error by mentioning what format
was trying to open it.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 89ac8480

block/bochs.c

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, 
        strcmp(bochs.subtype, GROWING_TYPE) ||

	((le32_to_cpu(bochs.version) != HEADER_VERSION) &&

	(le32_to_cpu(bochs.version) != HEADER_V1))) {

        return -EMEDIUMTYPE;

        error_setg(errp, "Image not in Bochs format");

        return -EINVAL;

    }



    if (le32_to_cpu(bochs.version) == HEADER_V1) {

block/cow.c

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ static int cow_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    if (be32_to_cpu(cow_header.magic) != COW_MAGIC) {

        ret = -EMEDIUMTYPE;

        error_setg(errp, "Image not in COW format");

        ret = -EINVAL;

        goto fail;

    }

block/parallels.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 


    if (memcmp(ph.magic, HEADER_MAGIC, 16) ||

        (le32_to_cpu(ph.version) != HEADER_VERSION)) {

        ret = -EMEDIUMTYPE;

        error_setg(errp, "Image not in Parallels format");

        ret = -EINVAL;

        goto fail;

    }

block/qcow.c

+2 −1
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, 
    be64_to_cpus(&header.l1_table_offset);



    if (header.magic != QCOW_MAGIC) {

        ret = -EMEDIUMTYPE;

        error_setg(errp, "Image not in qcow format");

        ret = -EINVAL;

        goto fail;

    }

    if (header.version != QCOW_VERSION) {

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, 


    if (header.magic != QCOW_MAGIC) {

        error_setg(errp, "Image is not in qcow2 format");

        ret = -EMEDIUMTYPE;

        ret = -EINVAL;

        goto fail;

    }

    if (header.version < 2 || header.version > 3) {