cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From b42dc567a9071719d730393e717ade1db25c1994 Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <b42dc567a9071719d730393e717ade1db25c1994.1387384437.git.minovotn@redhat.com>
0a122b
In-Reply-To: <58a5fcf24b76c3cf80d671c215b59a0fef76a5c5.1387384437.git.minovotn@redhat.com>
0a122b
References: <58a5fcf24b76c3cf80d671c215b59a0fef76a5c5.1387384437.git.minovotn@redhat.com>
0a122b
From: Fam Zheng <famz@redhat.com>
0a122b
Date: Tue, 10 Dec 2013 02:06:52 +0100
0a122b
Subject: [PATCH 2/2] vmdk: Allow read only open of VMDK version 3
0a122b
0a122b
RH-Author: Fam Zheng <famz@redhat.com>
0a122b
Message-id: <1386641212-24945-1-git-send-email-famz@redhat.com>
0a122b
Patchwork-id: 56099
0a122b
O-Subject: [RHEL-7 qemu-kvm PATCH] vmdk: Allow read only open of VMDK version 3
0a122b
Bugzilla: 1007710
0a122b
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
0a122b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
0a122b
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
0a122b
0a122b
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1029852
0a122b
Brew:     https://brewweb.devel.redhat.com/taskinfo?taskID=6698629
0a122b
0a122b
Signed-off-by: Fam Zheng <famz@redhat.com>
0a122b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
0a122b
(cherry picked from commit 509d39aa22909c0ed1aabf896865f19c81fb38a1)
0a122b
0a122b
Upstream commit doesn't have a verbose commit message, but as the
0a122b
comment says, VMware KB 2064959 [1] advises that backup software can
0a122b
read version=3 as version=1. This is important for virt-v2v and helps in
0a122b
importing VMware VMs from vSphere, since most of the vSphere exported
0a122b
OVF/OVA's come with version=3.
0a122b
0a122b
[1]: http://kb.vmware.com/kb/2064959
0a122b
0a122b
Signed-off-by: Fam Zheng <famz@redhat.com>
0a122b
---
0a122b
 block/vmdk.c | 9 ++++++++-
0a122b
 1 file changed, 8 insertions(+), 1 deletion(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 block/vmdk.c | 9 ++++++++-
0a122b
 1 file changed, 8 insertions(+), 1 deletion(-)
0a122b
0a122b
diff --git a/block/vmdk.c b/block/vmdk.c
0a122b
index 026b440..7ec6427 100644
0a122b
--- a/block/vmdk.c
0a122b
+++ b/block/vmdk.c
0a122b
@@ -605,13 +605,20 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
0a122b
         header = footer.header;
0a122b
     }
0a122b
 
0a122b
-    if (le32_to_cpu(header.version) >= 3) {
0a122b
+    if (le32_to_cpu(header.version) > 3) {
0a122b
         char buf[64];
0a122b
         snprintf(buf, sizeof(buf), "VMDK version %d",
0a122b
                  le32_to_cpu(header.version));
0a122b
         qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
0a122b
                 bs->device_name, "vmdk", buf);
0a122b
         return -ENOTSUP;
0a122b
+    } else if (le32_to_cpu(header.version) == 3 && (flags & BDRV_O_RDWR)) {
0a122b
+        /* VMware KB 2064959 explains that version 3 added support for
0a122b
+         * persistent changed block tracking (CBT), and backup software can
0a122b
+         * read it as version=1 if it doesn't care about the changed area
0a122b
+         * information. So we are safe to enable read only. */
0a122b
+        error_setg(errp, "VMDK version 3 must be read only");
0a122b
+        return -EINVAL;
0a122b
     }
0a122b
 
0a122b
     if (le32_to_cpu(header.num_gtes_per_gt) > 512) {
0a122b
-- 
0a122b
1.7.11.7
0a122b