From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1cd-0006NF-7e for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:20:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa1ca-0001pe-VI for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:20:14 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:39093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa1ca-0001pQ-Hq for qemu-devel@nongnu.org; Fri, 24 Jun 2011 04:20:12 -0400 Received: by iwn3 with SMTP id 3so2673473iwn.4 for ; Fri, 24 Jun 2011 01:20:11 -0700 (PDT) From: famcool@gmail.com Date: Fri, 24 Jun 2011 16:18:18 +0800 Message-Id: <1308903507-10799-4-git-send-email-famcool@gmail.com> In-Reply-To: <1308903507-10799-1-git-send-email-famcool@gmail.com> References: <1308903507-10799-1-git-send-email-famcool@gmail.com> Subject: [Qemu-devel] [PATCH v2 03/12] VMDK: probe for monolithicFlat images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com From: Fam Zheng 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 --- 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