From: Fam Zheng Date: Mon, 19 Aug 2013 10:54:26 +0000 (+0800) Subject: vmdk: fix L1 and L2 table size in vmdk3 open X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f6b61e54bdd5b9ef46837c15547e1819b3bb4f37;p=qemu.git 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 Signed-off-by: Stefan Hajnoczi --- diff --git a/block/vmdk.c b/block/vmdk.c index f8c0a4eace..4d282a662f 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -494,14 +494,14 @@ static int vmdk_open_vmdk3(BlockDriverState *bs, if (ret < 0) { return ret; } - - ret = vmdk_add_extent(bs, - bs->file, false, - le32_to_cpu(header.disk_sectors), - le32_to_cpu(header.l1dir_offset) << 9, - 0, 1 << 6, 1 << 9, - le32_to_cpu(header.granularity), - &extent); + ret = vmdk_add_extent(bs, file, false, + le32_to_cpu(header.disk_sectors), + le32_to_cpu(header.l1dir_offset) << 9, + 0, + le32_to_cpu(header.l1dir_size), + 4096, + le32_to_cpu(header.granularity), + &extent); if (ret < 0) { return ret; }