From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Don Koch <dkoch@verizon.com>,
Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v4 2/6] vmdk: Fix comment to match code of extent lines
Date: Thu, 4 Dec 2014 07:28:30 +0800 [thread overview]
Message-ID: <1417649314-13704-3-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1417649314-13704-1-git-send-email-famz@redhat.com>
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>
---
block/vmdk.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index ebb4b70..4ee0aed 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -785,10 +785,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.9.3
next prev parent reply other threads:[~2014-12-03 23:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 23:28 [Qemu-devel] [PATCH v4 0/6] vmdk: A few small fixes Fam Zheng
2014-12-03 23:28 ` [Qemu-devel] [PATCH v4 1/6] vmdk: Use g_random_int to generate CID Fam Zheng
2014-12-03 23:28 ` Fam Zheng [this message]
2014-12-04 8:59 ` [Qemu-devel] [PATCH v4 2/6] vmdk: Fix comment to match code of extent lines Max Reitz
2014-12-04 9:14 ` Markus Armbruster
2014-12-04 14:18 ` Don Koch
2014-12-03 23:28 ` [Qemu-devel] [PATCH v4 3/6] vmdk: Clean up descriptor file reading Fam Zheng
2014-12-03 23:28 ` [Qemu-devel] [PATCH v4 4/6] vmdk: Check descriptor file length when reading it Fam Zheng
2014-12-04 9:00 ` Max Reitz
2014-12-04 9:14 ` Markus Armbruster
2014-12-04 14:18 ` Don Koch
2014-12-03 23:28 ` [Qemu-devel] [PATCH v4 5/6] vmdk: Remove unnecessary initialization Fam Zheng
2014-12-03 23:28 ` [Qemu-devel] [PATCH v4 6/6] vmdk: Set errp on failures in vmdk_open_vmdk4 Fam Zheng
2014-12-04 14:27 ` [Qemu-devel] [PATCH v4 0/6] vmdk: A few small fixes Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417649314-13704-3-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=armbru@redhat.com \
--cc=dkoch@verizon.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).