From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1vqi-0007po-J9 for qemu-devel@nongnu.org; Thu, 16 Aug 2012 04:54:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1vqh-0007FY-Hf for qemu-devel@nongnu.org; Thu, 16 Aug 2012 04:54:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1vqh-0007FP-9g for qemu-devel@nongnu.org; Thu, 16 Aug 2012 04:54:39 -0400 From: Kevin Wolf Date: Thu, 16 Aug 2012 10:54:31 +0200 Message-Id: <1345107271-10154-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1345107271-10154-1-git-send-email-kwolf@redhat.com> References: <1345107271-10154-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] vmdk: Read footer for streamOptimized images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, jcody@redhat.com The footer takes precedence over the header when it exists. It contains the real grain directory offset that is missing in the header. Without this patch, streamOptimized images with a footer cannot be read. Signed-off-by: Kevin Wolf --- block/vmdk.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 9648398..c243a96 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_GD_AT_END 0xffffffffffffffffULL typedef struct { uint32_t version; @@ -451,6 +452,21 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, if (header.capacity == 0 && header.desc_offset) { return vmdk_open_desc_file(bs, flags, header.desc_offset << 9); } + + if (header.gd_offset == VMDK4_GD_AT_END) { + /* + * The footer takes precedence over the header, so read it in. The + * footer starts at offset -1024 from the end: One sector for the + * footer, and another one for the end-of-stream marker. + */ + ret = bdrv_pread(file, + bs->file->total_sectors * 512 - 1024 + sizeof(magic), + &header, sizeof(header)); + if (ret < 0) { + return ret; + } + } + l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) * le64_to_cpu(header.granularity); if (l1_entry_sectors == 0) { -- 1.7.6.5