From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiJ-0002T7-Tc for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xiD-0003qM-LK for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiD-0003ph-8r for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:21 -0400 From: Kevin Wolf Date: Tue, 6 Sep 2011 17:39:40 +0200 Message-Id: <1315323586-23840-26-git-send-email-kwolf@redhat.com> In-Reply-To: <1315323586-23840-1-git-send-email-kwolf@redhat.com> References: <1315323586-23840-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 25/31] VMDK: bugfix, open Haiku vmdk image List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Fam Zheng Haiku provides a specially formed vmdk image, which let qemu abort. It a combination of sparse header and flat data (i.e. with not l1/l2 table at all). The fix is turn to descriptor when sparse header is zero in field 'capacity'. Signed-off-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/vmdk.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 54f7441..892b18e 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -408,6 +408,9 @@ static int vmdk_open_vmdk3(BlockDriverState *bs, return ret; } +static int vmdk_open_desc_file(BlockDriverState *bs, int flags, + int64_t desc_offset); + static int vmdk_open_vmdk4(BlockDriverState *bs, BlockDriverState *file, int flags) @@ -422,6 +425,9 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, if (ret < 0) { return ret; } + if (header.capacity == 0 && header.desc_offset) { + return vmdk_open_desc_file(bs, flags, header.desc_offset << 9); + } l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) * le64_to_cpu(header.granularity); if (l1_entry_sectors <= 0) { @@ -559,7 +565,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, extent = vmdk_add_extent(bs, extent_file, true, sectors, 0, 0, 0, 0, sectors); - extent->flat_start_offset = flat_offset; + extent->flat_start_offset = flat_offset << 9; } else if (!strcmp(type, "SPARSE")) { /* SPARSE extent */ ret = vmdk_open_sparse(bs, extent_file, bs->open_flags); @@ -582,14 +588,15 @@ next_line: return 0; } -static int vmdk_open_desc_file(BlockDriverState *bs, int flags) +static int vmdk_open_desc_file(BlockDriverState *bs, int flags, + int64_t desc_offset) { int ret; char buf[2048]; char ct[128]; BDRVVmdkState *s = bs->opaque; - ret = bdrv_pread(bs->file, 0, buf, sizeof(buf)); + ret = bdrv_pread(bs->file, desc_offset, buf, sizeof(buf)); if (ret < 0) { return ret; } @@ -635,7 +642,7 @@ static int vmdk_open(BlockDriverState *bs, int flags) s->parent_cid = vmdk_read_cid(bs, 1); return 0; } else { - return vmdk_open_desc_file(bs, flags); + return vmdk_open_desc_file(bs, flags, 0); } } -- 1.7.6