[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] VMDK: footer must take precedence over header when present
From: |
B Gordon |
Subject: |
[Qemu-devel] VMDK: footer must take precedence over header when present |
Date: |
Wed, 21 Dec 2011 15:34:11 -0800 |
VMDK: footer must take precedence over header when present
In e.g. streamOptimized VMDKs from VSphere 4 with this flag set the
header l1_table is bogus and only the footer l1_table can be used to
correctly read extents.
Also reverts recent change to VMDK4Header so order of rgd_ and
gd_offset matches the VMDK spec.
https://bugs.launchpad.net/qemu/+bug/907063
Signed-off-by: B.B. Gordon <address@hidden>
diff --git a/block/vmdk.c b/block/vmdk.c
index 5623ac1..77ff9e1 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -35,6 +35,7 @@
#define VMDK4_FLAG_RGD (1 << 1)
#define VMDK4_FLAG_COMPRESS (1 << 16)
#define VMDK4_FLAG_MARKER (1 << 17)
+#define VMDK4_HEADER_AT_END 0xffffffffffffffffULL
typedef struct {
uint32_t version;
@@ -57,8 +58,8 @@ typedef struct {
int64_t desc_offset;
int64_t desc_size;
int32_t num_gtes_per_gte;
- int64_t gd_offset;
int64_t rgd_offset;
+ int64_t gd_offset;
int64_t grain_offset;
char filler[1];
char check_bytes[4];
@@ -443,11 +445,27 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
VMDK4Header header;
VmdkExtent *extent;
int64_t l1_backup_offset = 0;
+ struct stat sb;
ret = bdrv_pread(file, sizeof(magic), &header, sizeof(header));
if (ret < 0) {
return ret;
}
+ if (le64_to_cpu(header.gd_offset) == VMDK4_HEADER_AT_END) {
+ uint64_t filesize;
+ if (stat(bs->filename, &sb) == -1) {
+ fprintf(stderr, "Unable to get file size.\n");
+ return -1;
+ }
+ filesize = (((uint64_t)sb.st_size + (512 - 1)) &
~(uint64_t)(512 - 1));
+ ret = bdrv_pread(bs->file,
+ (filesize - 1024 + sizeof(magic)),
+ &header,
+ sizeof(header));
+ if (ret != sizeof(header)) {
+ return ret;
+ }
+ }
if (header.capacity == 0 && header.desc_offset) {
return vmdk_open_desc_file(bs, flags, header.desc_offset << 9);
}
--
http://www.fastmail.fm - Choose from over 50 domains or use your own
- [Qemu-devel] VMDK: footer must take precedence over header when present,
B Gordon <=