35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From: Fam Zheng <famz@redhat.com>
|
|
Date: Thu, 17 Sep 2015 13:04:10 +0800
|
|
Subject: [PATCH] vmdk: Create streamOptimized as version 3
|
|
|
|
VMware products accept only version 3 for streamOptimized, let's bump
|
|
the version.
|
|
|
|
Reported-by: Radoslav Gerganov <rgerganov@vmware.com>
|
|
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit d62d9dc4b814950dcc8bd261a3e2e9300d9065e6)
|
|
---
|
|
block/vmdk.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
index 4c71cde..27d86f0 100644
|
|
--- a/block/vmdk.c
|
|
+++ b/block/vmdk.c
|
|
@@ -1662,7 +1662,13 @@ static int vmdk_create_extent(const char *filename, int64_t filesize,
|
|
}
|
|
magic = cpu_to_be32(VMDK4_MAGIC);
|
|
memset(&header, 0, sizeof(header));
|
|
- header.version = zeroed_grain ? 2 : 1;
|
|
+ if (compress) {
|
|
+ header.version = 3;
|
|
+ } else if (zeroed_grain) {
|
|
+ header.version = 2;
|
|
+ } else {
|
|
+ header.version = 1;
|
|
+ }
|
|
header.flags = VMDK4_FLAG_RGD | VMDK4_FLAG_NL_DETECT
|
|
| (compress ? VMDK4_FLAG_COMPRESS | VMDK4_FLAG_MARKER : 0)
|
|
| (zeroed_grain ? VMDK4_FLAG_ZERO_GRAIN : 0);
|