diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-17 14:44:04 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-02-21 21:02:24 +0100 |
| commit | 37f09e5e3d206e7c555d28a7755cecfa137dad22 (patch) | |
| tree | 47cacc5a2a75c12ff1dd246b36cc7ba4ce7091e9 | |
| parent | d1833ef52be349e41d17e9c5ddaea8bb4ad3a7fb (diff) | |
| download | qemu-37f09e5e3d206e7c555d28a7755cecfa137dad22.tar.gz qemu-37f09e5e3d206e7c555d28a7755cecfa137dad22.tar.bz2 qemu-37f09e5e3d206e7c555d28a7755cecfa137dad22.zip | |
vmdk: do not try opening a file as both image and descriptor
This prepares for propagating errors from vmdk_open_sparse and
vmdk_open_desc_file up to the caller of vmdk_open.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/vmdk.c | 22 | ||||
| -rw-r--r-- | tests/qemu-iotests/059.out | 4 |
2 files changed, 17 insertions, 9 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index f34c16db7c..50a279a8d8 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -886,20 +886,28 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags, char *buf = NULL; int ret; BDRVVmdkState *s = bs->opaque; + uint32_t magic; buf = vmdk_read_desc(bs->file, 0, errp); if (!buf) { return -EINVAL; } - if (vmdk_open_sparse(bs, bs->file, flags, buf, errp) == 0) { - s->desc_offset = 0x200; - } else { - ret = vmdk_open_desc_file(bs, flags, buf, errp); - if (ret) { - goto fail; - } + magic = ldl_be_p(buf); + switch (magic) { + case VMDK3_MAGIC: + case VMDK4_MAGIC: + ret = vmdk_open_sparse(bs, bs->file, flags, buf, errp); + s->desc_offset = 0x200; + break; + default: + ret = vmdk_open_desc_file(bs, flags, buf, errp); + break; } + if (ret) { + goto fail; + } + /* try to open parent images, if exist */ ret = vmdk_parent_open(bs); if (ret) { diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 4ffeb54710..4600670161 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -8,7 +8,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': Wrong medium type +qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Invalid argument no file open, try 'help open' === Testing too big L1 table size === @@ -2046,7 +2046,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': Wrong medium type +qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'TEST_DIR/t.IMGFMT': Invalid argument === Testing version 3 === image: TEST_DIR/iotest-version3.IMGFMT |