From patchwork Thu Jul 14 19:03:06 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: 9230457 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 A8BCA6075D for ; Thu, 14 Jul 2016 19:09:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 993A92808C for ; Thu, 14 Jul 2016 19:09:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DCD528305; Thu, 14 Jul 2016 19:09:14 +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 3455D2808C for ; Thu, 14 Jul 2016 19:09:14 +0000 (UTC) Received: from localhost ([::1]:56292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNm0X-0000MD-9E for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:09:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvC-0003oG-Lp for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvB-0002fY-FO for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52184) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlv8-0002cy-IW; Thu, 14 Jul 2016 15:03:38 -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 262B1C049D5A; Thu, 14 Jul 2016 19:03:38 +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 u6EJ3T8X000405; Thu, 14 Jul 2016 15:03:37 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:06 -0400 Message-Id: <1468523008-30013-11-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.31]); Thu, 14 Jul 2016 19:03:38 +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 10/32] blockdev: Move qcow2 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 qcow2 probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/qcow2-probe.c | 16 ++++++++++++++++ block/qcow2.c | 13 +------------ include/block/probe.h | 1 + 4 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 block/qcow2-probe.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 01b2e4e..4a27bde 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -25,7 +25,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 +block-obj-y += parallels-probe.o qcow-probe.o qcow2-probe.o common-obj-y += stream.o common-obj-y += backup.o diff --git a/block/qcow2-probe.c b/block/qcow2-probe.c new file mode 100644 index 0000000..e5cd92c --- /dev/null +++ b/block/qcow2-probe.c @@ -0,0 +1,16 @@ +#include "qemu/osdep.h" +#include "block/block_int.h" +#include "block/probe.h" +#include "qcow2.h" + +int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + const QCowHeader *cow_header = (const void *)buf; + + if (buf_size >= sizeof(QCowHeader) && + be32_to_cpu(cow_header->magic) == QCOW_MAGIC && + be32_to_cpu(cow_header->version) >= 2) + return 100; + else + return 0; +} diff --git a/block/qcow2.c b/block/qcow2.c index a5ea19b..17521f7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -27,6 +27,7 @@ #include "qemu/module.h" #include #include "block/qcow2.h" +#include "block/probe.h" #include "qemu/error-report.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" @@ -64,18 +65,6 @@ typedef struct { #define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA #define QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857 -static int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - const QCowHeader *cow_header = (const void *)buf; - - if (buf_size >= sizeof(QCowHeader) && - be32_to_cpu(cow_header->magic) == QCOW_MAGIC && - be32_to_cpu(cow_header->version) >= 2) - return 100; - else - return 0; -} - /* * read qcow2 extension and fill bs diff --git a/include/block/probe.h b/include/block/probe.h index 5230da4..f9dd36e 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -8,5 +8,6 @@ int block_crypto_probe_luks(const uint8_t *buf, int buf_size, int dmg_probe(const uint8_t *buf, int buf_size, const char *filename); int parallels_probe(const uint8_t *buf, int buf_size, const char *filename); int qcow_probe(const uint8_t *buf, int buf_size, const char *filename); +int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename); #endif