From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qj7II-0006s8-93 for qemu-devel@nongnu.org; Tue, 19 Jul 2011 06:12:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qj7IG-0003Px-HG for qemu-devel@nongnu.org; Tue, 19 Jul 2011 06:12:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qj7IG-0003Pf-15 for qemu-devel@nongnu.org; Tue, 19 Jul 2011 06:12:48 -0400 From: Kevin Wolf Date: Tue, 19 Jul 2011 12:15:15 +0200 Message-Id: <1311070524-13533-13-git-send-email-kwolf@redhat.com> In-Reply-To: <1311070524-13533-1-git-send-email-kwolf@redhat.com> References: <1311070524-13533-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 12/21] VMDK: probe for monolithicFlat images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- 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