Commit f6b61e54 authored Aug 19, 2013 by Fam Zheng Committed by Stefan Hajnoczi Aug 22, 2013

vmdk: fix L1 and L2 table size in vmdk3 open

VMDK3 header has the field l1dir_size, but vmdk_open_vmdk3 hardcoded the
value. This patch honors the header field.

And the L2 table size is 4096 according to VMDK spec[1], instead of
1 << 9 (512).

[1]:
http://www.vmware.com/support/developer/vddk/vmdk_50_technote.pdf?src=vmdk



Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

parent b0651b8c

block/vmdk.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -494,12 +494,12 @@ static int vmdk_open_vmdk3(BlockDriverState *bs,
		if (ret < 0) {
		return ret;
		}

		ret = vmdk_add_extent(bs,
		bs->file, false,
		ret = vmdk_add_extent(bs, file, false,
		le32_to_cpu(header.disk_sectors),
		le32_to_cpu(header.l1dir_offset) << 9,
		0, 1 << 6, 1 << 9,
		0,
		le32_to_cpu(header.l1dir_size),
		4096,
		le32_to_cpu(header.granularity),
		&extent);
		if (ret < 0) {