Blame SOURCES/kvm-vmdk-Fix-comment-to-match-code-of-extent-lines.patch

34b321
From ad76b22d2d96499bbbd1172f347b4ec8a2327c7d Mon Sep 17 00:00:00 2001
34b321
From: Fam Zheng <famz@redhat.com>
34b321
Date: Mon, 15 Feb 2016 09:28:16 +0100
34b321
Subject: [PATCH 03/18] vmdk: Fix comment to match code of extent lines
34b321
34b321
RH-Author: Fam Zheng <famz@redhat.com>
34b321
Message-id: <1455528511-9357-4-git-send-email-famz@redhat.com>
34b321
Patchwork-id: 69169
34b321
O-Subject: [RHEL-7.3 qemu-kvm PATCH 03/18] vmdk: Fix comment to match code of extent lines
34b321
Bugzilla: 1299250
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=1299250
34b321
34b321
commit 04d542c8b (vmdk: support vmfs files) added support of VMFS extent
34b321
type but the comment above the changed code is left out. Update the
34b321
comment so they are consistent.
34b321
34b321
Signed-off-by: Fam Zheng <famz@redhat.com>
34b321
Reviewed-by: Max Reitz <mreitz@redhat.com>
34b321
Reviewed-by: Markus Armbruster <armbru@redhat.com>
34b321
Reviewed-by: Don Koch <dkoch@verizon.com>
34b321
Message-id: 1417649314-13704-3-git-send-email-famz@redhat.com
34b321
Signed-off-by: Max Reitz <mreitz@redhat.com>
34b321
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
34b321
(cherry picked from commit 8a3e0bc370de9274170b82f48b0393204c3fb43b)
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, 4 insertions(+), 2 deletions(-)
34b321
34b321
diff --git a/block/vmdk.c b/block/vmdk.c
34b321
index a9f5bab..3f34abf 100644
34b321
--- a/block/vmdk.c
34b321
+++ b/block/vmdk.c
34b321
@@ -788,10 +788,12 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
34b321
     VmdkExtent *extent;
34b321
 
34b321
     while (*p) {
34b321
-        /* parse extent line:
34b321
+        /* parse extent line in one of below formats:
34b321
+         *
34b321
          * RW [size in sectors] FLAT "file-name.vmdk" OFFSET
34b321
-         * or
34b321
          * RW [size in sectors] SPARSE "file-name.vmdk"
34b321
+         * RW [size in sectors] VMFS "file-name.vmdk"
34b321
+         * RW [size in sectors] VMFSSPARSE "file-name.vmdk"
34b321
          */
34b321
         flat_offset = -1;
34b321
         ret = sscanf(p, "%10s %" SCNd64 " %10s \"%511[^\n\r\"]\" %" SCNd64,
34b321
-- 
34b321
1.8.3.1
34b321