From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QooJw-0000Mf-CP for qemu-devel@nongnu.org; Wed, 03 Aug 2011 23:10:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QooJu-00067k-Rb for qemu-devel@nongnu.org; Wed, 03 Aug 2011 23:10:04 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:33900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QooJu-00065n-I8 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 23:10:02 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so1345829pzk.29 for ; Wed, 03 Aug 2011 20:10:02 -0700 (PDT) From: Fam Zheng Date: Thu, 4 Aug 2011 11:09:19 +0800 Message-Id: <1312427361-7046-5-git-send-email-famcool@gmail.com> In-Reply-To: <1312427361-7046-1-git-send-email-famcool@gmail.com> References: <1312427361-7046-1-git-send-email-famcool@gmail.com> Subject: [Qemu-devel] [PATCH v2 4/6] VMDK: Opening compressed extent. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Added flags field for compressed/streamOptimized extents, open and save image configuration. Signed-off-by: Fam Zheng --- block/vmdk.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index bc725be..df93ba5 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -26,9 +26,13 @@ #include "qemu-common.h" #include "block_int.h" #include "module.h" +#include "zlib.h" #define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D') #define VMDK4_MAGIC (('K' << 24) | ('D' << 16) | ('M' << 8) | 'V') +#define VMDK4_COMPRESSION_DEFLATE 1 +#define VMDK4_FLAG_COMPRESS (1 << 16) +#define VMDK4_FLAG_MARKER (1 << 17) typedef struct { uint32_t version; @@ -56,6 +60,7 @@ typedef struct { int64_t grain_offset; char filler[1]; char check_bytes[4]; + uint16_t compressAlgorithm; } __attribute__((packed)) VMDK4Header; #define L2_CACHE_SIZE 16 @@ -63,6 +68,8 @@ typedef struct { typedef struct VmdkExtent { BlockDriverState *file; bool flat; + bool compressed; + bool has_marker; int64_t sectors; int64_t end_sector; int64_t flat_start_offset; @@ -98,6 +105,12 @@ typedef struct VmdkMetaData { int valid; } VmdkMetaData; +typedef struct VmdkGrainMarker { + uint64_t lba; + uint32_t size; + uint8_t data[0]; +} VmdkGrainMarker; + static int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename) { uint32_t magic; @@ -423,6 +436,9 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, l1_size, le32_to_cpu(header.num_gtes_per_gte), le64_to_cpu(header.granularity)); + extent->compressed = + le16_to_cpu(header.compressAlgorithm) == VMDK4_COMPRESSION_DEFLATE; + extent->has_marker = le32_to_cpu(header.flags) & VMDK4_FLAG_MARKER; ret = vmdk_init_tables(bs, extent); if (ret) { /* free extent allocated by vmdk_add_extent */