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