From patchwork Tue Sep 6 15:39:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 113589 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 027FCB6F6F for ; Wed, 7 Sep 2011 01:41:06 +1000 (EST) Received: from localhost ([::1]:42281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xj4-0003pG-Tv for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 11:38:14 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiG-0002Gw-Ee for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xiA-0003p0-Ed for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiA-0003ok-5v for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:18 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p86FbGbm017384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Sep 2011 11:37:16 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p86FamTY015671; Tue, 6 Sep 2011 11:37:15 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 6 Sep 2011 17:39:37 +0200 Message-Id: <1315323586-23840-23-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 22/31] VMDK: Opening compressed extent. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Fam Zheng Added flags field for compressed/streamOptimized extents, open and save image configuration. Signed-off-by: Fam Zheng Reviewed-by: Stefan Hajnoczi 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 106fdbd..8a96cfd 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; } QEMU_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 */