From patchwork Thu Jul 14 19:03:10 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: 9230503 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 F2DD560574 for ; Thu, 14 Jul 2016 19:31:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E04A2282F5 for ; Thu, 14 Jul 2016 19:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D387628306; Thu, 14 Jul 2016 19:31:35 +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 59E89282F5 for ; Thu, 14 Jul 2016 19:31:35 +0000 (UTC) Received: from localhost ([::1]:56444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmMA-0004WB-DF for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:31:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvM-000433-1s for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvG-0002jE-LU for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvB-0002fU-Et; Thu, 14 Jul 2016 15:03:41 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 10FCCD6845; Thu, 14 Jul 2016 19:03:41 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6EJ3T8b000405; Thu, 14 Jul 2016 15:03:40 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:10 -0400 Message-Id: <1468523008-30013-15-git-send-email-clord@redhat.com> In-Reply-To: <1468523008-30013-1-git-send-email-clord@redhat.com> References: <1468523008-30013-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 14 Jul 2016 19:03:41 +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 v4 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/vhdx-probe.c | 21 +++++++++++++++++++++ block/vhdx.c | 20 +------------------- include/block/probe.h | 1 + 4 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 block/vhdx-probe.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 9f9e83f..4363667 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 += bochs-probe.o cloop-probe.o crypto-probe.o dmg-probe.o block-obj-y += parallels-probe.o qcow-probe.o qcow2-probe.o qed-probe.o -block-obj-y += raw-probe.o vdi-probe.o +block-obj-y += raw-probe.o vdi-probe.o vhdx-probe.o common-obj-y += stream.o common-obj-y += backup.o diff --git a/block/vhdx-probe.c b/block/vhdx-probe.c new file mode 100644 index 0000000..6c38aac --- /dev/null +++ b/block/vhdx-probe.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 75ef2b1..2f13c61 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