[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/21] VMDK: probe for monolithicFlat images
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 12/21] VMDK: probe for monolithicFlat images |
Date: |
Tue, 19 Jul 2011 12:15:15 +0200 |
From: Fam Zheng <address@hidden>
Probe as the same behavior as VMware does.
Recognize image as monolithicFlat descriptor file when the file is text
and the first effective line (not '#' leaded comment or space line) is
either 'version=1' or 'version=2'. No space or upper case charactors
accepted.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vmdk.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 03a4619..f8a815c 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -103,10 +103,51 @@ static int vmdk_probe(const uint8_t *buf, int buf_size,
const char *filename)
return 0;
magic = be32_to_cpu(*(uint32_t *)buf);
if (magic == VMDK3_MAGIC ||
- magic == VMDK4_MAGIC)
+ magic == VMDK4_MAGIC) {
return 100;
- else
+ } else {
+ const char *p = (const char *)buf;
+ const char *end = p + buf_size;
+ while (p < end) {
+ if (*p == '#') {
+ /* skip comment line */
+ while (p < end && *p != '\n') {
+ p++;
+ }
+ p++;
+ continue;
+ }
+ if (*p == ' ') {
+ while (p < end && *p == ' ') {
+ p++;
+ }
+ /* skip '\r' if windows line endings used. */
+ if (p < end && *p == '\r') {
+ p++;
+ }
+ /* only accept blank lines before 'version=' line */
+ if (p == end || *p != '\n') {
+ return 0;
+ }
+ p++;
+ continue;
+ }
+ if (end - p >= strlen("version=X\n")) {
+ if (strncmp("version=1\n", p, strlen("version=1\n")) == 0 ||
+ strncmp("version=2\n", p, strlen("version=2\n")) == 0) {
+ return 100;
+ }
+ }
+ if (end - p >= strlen("version=X\r\n")) {
+ if (strncmp("version=1\r\n", p, strlen("version=1\r\n")) == 0
||
+ strncmp("version=2\r\n", p, strlen("version=2\r\n")) == 0)
{
+ return 100;
+ }
+ }
+ return 0;
+ }
return 0;
+ }
}
#define CHECK_CID 1
--
1.7.6
- [Qemu-devel] [PULL 00/21] Block patches, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 03/21] qemu-io: Fix if scoping bug, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 01/21] sheepdog: add full data preallocation support, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 08/21] qemu-options.hx: Document missing -drive options, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 09/21] qemu-config: Document -drive options, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 04/21] iov: Update parameter usage in iov_(to|from)_buf(), Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 06/21] scsi-disk: Fixup debugging statement, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 12/21] VMDK: probe for monolithicFlat images,
Kevin Wolf <=
- [Qemu-devel] [PATCH 10/21] VMDK: introduce VmdkExtent, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 11/21] VMDK: bugfix, align offset to cluster in get_whole_cluster, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 05/21] scsi: Add 'hba_private' to SCSIRequest, Kevin Wolf, 2011/07/19
- Re: [Qemu-devel] [PATCH 05/21] scsi: Add 'hba_private' to SCSIRequest, Benjamin Herrenschmidt, 2011/07/19
- Re: [Qemu-devel] [PATCH 05/21] scsi: Add 'hba_private' to SCSIRequest, David Gibson, 2011/07/20