From patchwork Fri Jul 1 04:55:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feiran Zheng X-Patchwork-Id: 102860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4CF52B6F57 for ; Fri, 1 Jul 2011 15:00:04 +1000 (EST) Received: from localhost ([::1]:46433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QcVpg-0003aW-Iz for incoming@patchwork.ozlabs.org; Fri, 01 Jul 2011 01:00:00 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QcVmC-0003Zk-6W for qemu-devel@nongnu.org; Fri, 01 Jul 2011 00:56:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QcVmA-000278-Pk for qemu-devel@nongnu.org; Fri, 01 Jul 2011 00:56:24 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:39702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QcVmA-00025U-1p for qemu-devel@nongnu.org; Fri, 01 Jul 2011 00:56:22 -0400 Received: by mail-iw0-f173.google.com with SMTP id 3so2879766iwn.4 for ; Thu, 30 Jun 2011 21:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=at8/ye4olSm5zPO9VGreUlhFfxpu8JI6Tr4Sge8ILFw=; b=xUIXrCa/LalnuInTmekQOdA2yI4Hu47ApU3nGhH8ZtOc+wUvOvxiE8+oNXgjUY1q1I cX/NXqozZd+Je7yKeytjVwbUk4fSoBYqLZ3zCRbC7VhfowlPN8QEIL+lYQnUZete2SGQ 1OmzoOy1p9BHYY54BB/EaEXJ0enoqYBGEhWbE= Received: by 10.231.10.138 with SMTP id p10mr2551808ibp.84.1309496181693; Thu, 30 Jun 2011 21:56:21 -0700 (PDT) Received: from localhost.localdomain ([111.187.42.58]) by mx.google.com with ESMTPS id v16sm1638855ibe.0.2011.06.30.21.56.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 30 Jun 2011 21:56:20 -0700 (PDT) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2011 12:55:33 +0800 Message-Id: <1309496142-14228-4-git-send-email-famcool@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1309496142-14228-1-git-send-email-famcool@gmail.com> References: <1309496142-14228-1-git-send-email-famcool@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.173 Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Subject: [Qemu-devel] [PATCH v6 03/12] VMDK: probe for monolithicFlat images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 557e01e..4684670 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -102,10 +102,50 @@ 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; + } } #define CHECK_CID 1