Commit 89ac8480 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

vmdk: correctly propagate errors 



Now that we can return the "right" errors, use the Error** parameter
to pass them back instead of just printing them.

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 37f09e5e

block/vmdk.c

+6 −5
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, 
        error_setg_errno(errp, -ret,

                         "Could not read header from file '%s'",

                         file->filename);

        return -EINVAL;

    }

    if (header.capacity == 0) {

        uint64_t desc_offset = le64_to_cpu(header.desc_offset);
@@ -641,7 +642,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, 
        char buf[64];

        snprintf(buf, sizeof(buf), "VMDK version %d",

                 le32_to_cpu(header.version));

        qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,

        error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,

                  bs->device_name, "vmdk", buf);

        return -ENOTSUP;

    } else if (le32_to_cpu(header.version) == 3 && (flags & BDRV_O_RDWR)) {
@@ -654,7 +655,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, 
    }



    if (le32_to_cpu(header.num_gtes_per_gt) > 512) {

        error_report("L2 table size too big");

        error_setg(errp, "L2 table size too big");

        return -EINVAL;

    }
@@ -670,7 +671,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, 
    }

    if (bdrv_getlength(file) <

            le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE) {

        error_report("File truncated, expecting at least %lld bytes",

        error_setg(errp, "File truncated, expecting at least %lld bytes",

                   le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE);

        return -EINVAL;

    }

tests/qemu-iotests/059.out

+2 −4
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ no file open, try 'help open' 


=== Testing too big L2 table size ===

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

L2 table size too big

qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Invalid argument

qemu-io: can't open device TEST_DIR/t.vmdk: L2 table size too big

no file open, try 'help open'



=== Testing too big L1 table size ===
@@ -2045,8 +2044,7 @@ RW 12582912 VMFS "dummy.IMGFMT" 1 


=== Testing truncated sparse ===

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400

qemu-img: File truncated, expecting at least 13172736 bytes

qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'TEST_DIR/t.IMGFMT': Invalid argument

qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at least 13172736 bytes



=== Testing version 3 ===

image: TEST_DIR/iotest-version3.IMGFMT