[Qemu-devel] [PATCH v2 03/12] VMDK: probe for monolithicFlat images

[famcool]

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>
---
 block/vmdk.c |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/block/vmdk.c b/block/vmdk.c
index 0540ec5..71d81bc 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -102,10 +102,41 @@ 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
-        return 0;
+    } else {
+        const char *p = (const char *)buf;
+        const char *end = p + buf_size;
+        int version = 0;
+        while (*p && p < end) {
+            if (*p == '#') {
+                /* skip comment line */
+                while (*p != '\n' && p < end) {
+                    p++;
+                }
+                p++;
+                continue;
+            }
+            if (*p == ' ') {
+                while (*p == ' ' && p < end) {
+                    p++;
+                }
+                /* only accept blank lines before 'version=' line */
+                if (*p != '\n') {
+                    return 0;
+                }
+                p++;
+                continue;
+            }
+            sscanf(p, "version=%d", &version);
+            if (version == 1 || version == 2) {
+                return 100;
+            } else {
+                return 0;
+            }
+        }
+    }
+    return 0;
 }
 
 #define CHECK_CID 1