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