|
 |
34b321 |
From b72998772910dbd04c86a2332b1c69ac1afc7a9e Mon Sep 17 00:00:00 2001
|
|
|
34b321 |
From: Fam Zheng <famz@redhat.com>
|
|
|
34b321 |
Date: Mon, 15 Feb 2016 09:28:30 +0100
|
|
|
34b321 |
Subject: [PATCH 17/18] vmdk: Fix converting to streamOptimized
|
|
|
34b321 |
|
|
|
34b321 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
34b321 |
Message-id: <1455528511-9357-18-git-send-email-famz@redhat.com>
|
|
|
34b321 |
Patchwork-id: 69183
|
|
|
34b321 |
O-Subject: [RHEL-7.3 qemu-kvm PATCH 17/18] vmdk: Fix converting to streamOptimized
|
|
|
34b321 |
Bugzilla: 1299116
|
|
|
34b321 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
34b321 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
34b321 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
34b321 |
|
|
|
34b321 |
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1299116
|
|
|
34b321 |
|
|
|
34b321 |
Commit d62d9dc4b8 lifted streamOptimized images's version to 3, but we
|
|
|
34b321 |
now refuse to open version 3 images read-write. We need to make
|
|
|
34b321 |
streamOptimized an exception to allow converting to it. This fixes the
|
|
|
34b321 |
accidentally broken iotests case 059 for the same reason.
|
|
|
34b321 |
|
|
|
34b321 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
34b321 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
34b321 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
34b321 |
(cherry picked from commit 3db1d98a20262228373bb973ca62b1ab64b29af4)
|
|
|
34b321 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
34b321 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
34b321 |
---
|
|
|
34b321 |
block/vmdk.c | 6 +++++-
|
|
|
34b321 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
34b321 |
|
|
|
34b321 |
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
|
34b321 |
index 7b3e397..b0c312b 100644
|
|
|
34b321 |
--- a/block/vmdk.c
|
|
|
34b321 |
+++ b/block/vmdk.c
|
|
|
34b321 |
@@ -592,6 +592,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
34b321 |
VmdkExtent *extent;
|
|
|
34b321 |
BDRVVmdkState *s = bs->opaque;
|
|
|
34b321 |
int64_t l1_backup_offset = 0;
|
|
|
34b321 |
+ bool compressed;
|
|
|
34b321 |
|
|
|
34b321 |
ret = bdrv_pread(file, sizeof(magic), &header, sizeof(header));
|
|
|
34b321 |
if (ret < 0) {
|
|
|
34b321 |
@@ -666,6 +667,8 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
34b321 |
header = footer.header;
|
|
|
34b321 |
}
|
|
|
34b321 |
|
|
|
34b321 |
+ compressed =
|
|
|
34b321 |
+ le16_to_cpu(header.compressAlgorithm) == VMDK4_COMPRESSION_DEFLATE;
|
|
|
34b321 |
if (le32_to_cpu(header.version) > 3) {
|
|
|
34b321 |
char buf[64];
|
|
|
34b321 |
snprintf(buf, sizeof(buf), "VMDK version %" PRId32,
|
|
|
34b321 |
@@ -673,7 +676,8 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
34b321 |
error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
|
|
|
34b321 |
bs->device_name, "vmdk", buf);
|
|
|
34b321 |
return -ENOTSUP;
|
|
|
34b321 |
- } else if (le32_to_cpu(header.version) == 3 && (flags & BDRV_O_RDWR)) {
|
|
|
34b321 |
+ } else if (le32_to_cpu(header.version) == 3 && (flags & BDRV_O_RDWR) &&
|
|
|
34b321 |
+ !compressed) {
|
|
|
34b321 |
/* VMware KB 2064959 explains that version 3 added support for
|
|
|
34b321 |
* persistent changed block tracking (CBT), and backup software can
|
|
|
34b321 |
* read it as version=1 if it doesn't care about the changed area
|
|
|
34b321 |
--
|
|
|
34b321 |
1.8.3.1
|
|
|
34b321 |
|