diff options
| author | Fam Zheng <famcool@gmail.com> | 2011-08-12 23:19:30 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-09-06 12:27:42 +0200 |
| commit | 432bb170afd168304ddff111fa3881b2458a67ac (patch) | |
| tree | 578feee9786d370faef68abd7e0b1139d351cc7b /block | |
| parent | dd3f6ee211d248bc8cf27cc839e94dfa42348cd9 (diff) | |
VMDK: Opening compressed extent.
Added flags field for compressed/streamOptimized extents, open and save
image configuration.
Signed-off-by: Fam Zheng <famcool@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vmdk.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 106fdbd2d..8a96cfd35 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 */ |