From patchwork Tue Jul 5 15:24:14 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: 9214621 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 1B9946048B for ; Tue, 5 Jul 2016 15:43:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D5A926212 for ; Tue, 5 Jul 2016 15:43:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02345262F2; Tue, 5 Jul 2016 15:43:26 +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 90F5626212 for ; Tue, 5 Jul 2016 15:43:26 +0000 (UTC) Received: from localhost ([::1]:55898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSVR-00019Y-Ml for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:43:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDW-00064w-RO 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-00005a-Bl for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDM-0008QZ-KS; Tue, 05 Jul 2016 11:24:44 -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 446DA7F6C1; Tue, 5 Jul 2016 15:24:44 +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 u65FOWuA006841; Tue, 5 Jul 2016 11:24:43 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:14 -0400 Message-Id: <1467732272-23368-15-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.25]); Tue, 05 Jul 2016 15:24:44 +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 14/32] blockdev: Move vhdx 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 vhdx probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/probe/vhdx.c | 21 +++++++++++++++++++++ block/vhdx.c | 20 +------------------- include/block/probe.h | 1 + 4 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 block/probe/vhdx.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 4a5bd88..89e0da4 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 +block-obj-y += probe/raw.o probe/vdi.o probe/vhdx.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/vhdx.c b/block/probe/vhdx.c new file mode 100644 index 0000000..6c38aac --- /dev/null +++ b/block/probe/vhdx.c @@ -0,0 +1,21 @@ +#include "qemu/osdep.h" +#include "block/probe.h" + +/* + * Per the MS VHDX Specification, for every VHDX file: + * - The header section is fixed size - 1 MB + * - The header section is always the first "object" + * - The first 64KB of the header is the File Identifier + * - The first uint64 (8 bytes) is the VHDX Signature ("vhdxfile") + * - The following 512 bytes constitute a UTF-16 string identifiying the + * software that created the file, and is optional and diagnostic only. + * + * Therefore, we probe by looking for the vhdxfile signature "vhdxfile" + */ +int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + if (buf_size >= 8 && !memcmp(buf, "vhdxfile", 8)) { + return 100; + } + return 0; +} diff --git a/block/vhdx.c b/block/vhdx.c index f5605a2..ba8adfe 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -19,6 +19,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" +#include "block/probe.h" #include "sysemu/block-backend.h" #include "qemu/module.h" #include "qemu/crc32c.h" @@ -273,25 +274,6 @@ static void vhdx_set_shift_bits(BDRVVHDXState *s) } /* - * Per the MS VHDX Specification, for every VHDX file: - * - The header section is fixed size - 1 MB - * - The header section is always the first "object" - * - The first 64KB of the header is the File Identifier - * - The first uint64 (8 bytes) is the VHDX Signature ("vhdxfile") - * - The following 512 bytes constitute a UTF-16 string identifiying the - * software that created the file, and is optional and diagnostic only. - * - * Therefore, we probe by looking for the vhdxfile signature "vhdxfile" - */ -static int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - if (buf_size >= 8 && !memcmp(buf, "vhdxfile", 8)) { - return 100; - } - return 0; -} - -/* * Writes the header to the specified offset. * * This will optionally read in buffer data from disk (otherwise zero-fill), diff --git a/include/block/probe.h b/include/block/probe.h index f85c178..e901d8f 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -12,5 +12,6 @@ int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename); 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); #endif