Am 13.08.2013 um 03:21 hat Fam Zheng geschrieben: > 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 <f...@redhat.com> > --- > block/vmdk.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 346bb5c..1392542 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -486,14 +486,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);
You'll want to add a sanity check for header.l1dir_dir, or move the existing check from vmdk_open_vmdk4() to vmdk_add_extent(). Kevin
