From patchwork Tue Jul 5 15:24:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: clord@redhat.com X-Patchwork-Id: 9214615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 634F060752 for ; Tue, 5 Jul 2016 15:40:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5521B2624C for ; Tue, 5 Jul 2016 15:40:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49F22262F2; Tue, 5 Jul 2016 15:40:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A9AD52624C for ; Tue, 5 Jul 2016 15:40:28 +0000 (UTC) Received: from localhost ([::1]:55875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSSZ-00070I-Cr for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:40:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDW-000669-I5 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDU-00006M-Vb for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDN-0008RT-C7; Tue, 05 Jul 2016 11:24:45 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00EAA63175; Tue, 5 Jul 2016 15:24:45 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (dhcp-17-5.bos.redhat.com [10.18.17.5]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u65FOWuB006841; Tue, 5 Jul 2016 11:24:44 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:15 -0400 Message-Id: <1467732272-23368-16-git-send-email-clord@redhat.com> In-Reply-To: <1467732272-23368-1-git-send-email-clord@redhat.com> References: <1467732272-23368-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 05 Jul 2016 15:24:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 15/32] blockdev: Move vmdk probe to its own file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Colin Lord , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Isolates vmdk probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/probe/vmdk.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ block/vmdk.c | 60 ++------------------------------------------- include/block/driver/vmdk.h | 7 ++++++ include/block/probe.h | 1 + 5 files changed, 71 insertions(+), 59 deletions(-) create mode 100644 block/probe/vmdk.c create mode 100644 include/block/driver/vmdk.h diff --git a/block/Makefile.objs b/block/Makefile.objs index 89e0da4..4cecf68 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -26,7 +26,7 @@ block-obj-y += write-threshold.o block-obj-y += crypto.o block-obj-y += probe/bochs.o probe/cloop.o probe/luks.o probe/dmg.o block-obj-y += probe/parallels.o probe/qcow.o probe/qcow2.o probe/qed.o -block-obj-y += probe/raw.o probe/vdi.o probe/vhdx.o +block-obj-y += probe/raw.o probe/vdi.o probe/vhdx.o probe/vmdk.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/vmdk.c b/block/probe/vmdk.c new file mode 100644 index 0000000..cb9bd3d --- /dev/null +++ b/block/probe/vmdk.c @@ -0,0 +1,60 @@ +#include "qemu/osdep.h" +#include "block/block_int.h" +#include "block/probe.h" +#include "block/driver/vmdk.h" + +int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + uint32_t magic; + + if (buf_size < 4) { + return 0; + } + magic = be32_to_cpu(*(uint32_t *)buf); + if (magic == VMDK3_MAGIC || + magic == VMDK4_MAGIC) { + return 100; + } 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; + } +} diff --git a/block/vmdk.c b/block/vmdk.c index 2901692..d22db95 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -26,6 +26,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "block/block_int.h" +#include "block/probe.h" +#include "block/driver/vmdk.h" #include "sysemu/block-backend.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" @@ -35,8 +37,6 @@ #include "qemu/cutils.h" #include -#define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D') -#define VMDK4_MAGIC (('K' << 24) | ('D' << 16) | ('M' << 8) | 'V') #define VMDK4_COMPRESSION_DEFLATE 1 #define VMDK4_FLAG_NL_DETECT (1 << 0) #define VMDK4_FLAG_RGD (1 << 1) @@ -151,62 +151,6 @@ enum { MARKER_FOOTER = 3, }; -static int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - uint32_t magic; - - if (buf_size < 4) { - return 0; - } - magic = be32_to_cpu(*(uint32_t *)buf); - if (magic == VMDK3_MAGIC || - magic == VMDK4_MAGIC) { - return 100; - } 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 SECTOR_SIZE 512 #define DESC_SIZE (20 * SECTOR_SIZE) /* 20 sectors of 512 bytes each */ #define BUF_SIZE 4096 diff --git a/include/block/driver/vmdk.h b/include/block/driver/vmdk.h new file mode 100644 index 0000000..d631468 --- /dev/null +++ b/include/block/driver/vmdk.h @@ -0,0 +1,7 @@ +#ifndef VMDK_H +#define VMDK_H + +#define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D') +#define VMDK4_MAGIC (('K' << 24) | ('D' << 16) | ('M' << 8) | 'V') + +#endif diff --git a/include/block/probe.h b/include/block/probe.h index e901d8f..392515d 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -13,5 +13,6 @@ int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename); int raw_probe(const uint8_t *buf, int buf_size, const char *filename); int vdi_probe(const uint8_t *buf, int buf_size, const char *filename); int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename); +int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename); #endif