From: Fam Zheng <famz@redhat.com>
Date: Thu, 17 Sep 2015 05:04:10 +0000 (+0800)
Subject: vmdk: Create streamOptimized as version 3
X-Git-Tag: v2.5.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acea76c162a51fa3c65426d64c74cfc67063df00;p=thirdparty%2Fqemu.git

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)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/block/vmdk.c b/block/vmdk.c
index 6f819e413f1..26b76d9606b 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1654,7 +1654,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);