From patchwork Tue Jul 5 15:24:09 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: 9214619 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 76D7F6048B for ; Tue, 5 Jul 2016 15:43:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67D6826212 for ; Tue, 5 Jul 2016 15:43:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C7F8262F2; Tue, 5 Jul 2016 15:43:16 +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 D144D26212 for ; Tue, 5 Jul 2016 15:43:15 +0000 (UTC) Received: from localhost ([::1]:55897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSVG-00010m-NO for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:43:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDS-0005zS-53 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDN-0008RJ-3H for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDI-0008Mq-VC; Tue, 05 Jul 2016 11:24:41 -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 9484062666; Tue, 5 Jul 2016 15:24:40 +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 u65FOWu5006841; Tue, 5 Jul 2016 11:24:39 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:09 -0400 Message-Id: <1467732272-23368-10-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.39]); Tue, 05 Jul 2016 15:24:40 +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 09/32] blockdev: Move qcow 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 qcow probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/probe/qcow.c | 16 ++++++++++++++++ block/qcow.c | 31 ++----------------------------- include/block/driver/qcow.h | 21 +++++++++++++++++++++ include/block/probe.h | 1 + 5 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 block/probe/qcow.c create mode 100644 include/block/driver/qcow.h diff --git a/block/Makefile.objs b/block/Makefile.objs index 12607db..9458da8 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 += probe/bochs.o probe/cloop.o probe/luks.o probe/dmg.o -block-obj-y += probe/parallels.o +block-obj-y += probe/parallels.o probe/qcow.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/qcow.c b/block/probe/qcow.c new file mode 100644 index 0000000..6024d11 --- /dev/null +++ b/block/probe/qcow.c @@ -0,0 +1,16 @@ +#include "qemu/osdep.h" +#include "block/block_int.h" +#include "block/probe.h" +#include "block/driver/qcow.h" + +int qcow_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) == QCOW_VERSION) + return 100; + else + return 0; +} diff --git a/block/qcow.c b/block/qcow.c index 312af52..828749c 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -26,6 +26,8 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "block/block_int.h" +#include "block/probe.h" +#include "block/driver/qcow.h" #include "sysemu/block-backend.h" #include "qemu/module.h" #include "qemu/bswap.h" @@ -37,28 +39,11 @@ /**************************************************************/ /* QEMU COW block driver with compression and encryption support */ -#define QCOW_MAGIC (('Q' << 24) | ('F' << 16) | ('I' << 8) | 0xfb) -#define QCOW_VERSION 1 - #define QCOW_CRYPT_NONE 0 #define QCOW_CRYPT_AES 1 #define QCOW_OFLAG_COMPRESSED (1LL << 63) -typedef struct QCowHeader { - uint32_t magic; - uint32_t version; - uint64_t backing_file_offset; - uint32_t backing_file_size; - uint32_t mtime; - uint64_t size; /* in bytes */ - uint8_t cluster_bits; - uint8_t l2_bits; - uint16_t padding; - uint32_t crypt_method; - uint64_t l1_table_offset; -} QEMU_PACKED QCowHeader; - #define L2_CACHE_SIZE 16 typedef struct BDRVQcowState { @@ -85,18 +70,6 @@ typedef struct BDRVQcowState { static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset); -static int qcow_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) == QCOW_VERSION) - return 100; - else - return 0; -} - static int qcow_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { diff --git a/include/block/driver/qcow.h b/include/block/driver/qcow.h new file mode 100644 index 0000000..c96ea24 --- /dev/null +++ b/include/block/driver/qcow.h @@ -0,0 +1,21 @@ +#ifndef QCOW_H +#define QCOW_H + +#define QCOW_MAGIC (('Q' << 24) | ('F' << 16) | ('I' << 8) | 0xfb) +#define QCOW_VERSION 1 + +typedef struct QCowHeader { + uint32_t magic; + uint32_t version; + uint64_t backing_file_offset; + uint32_t backing_file_size; + uint32_t mtime; + uint64_t size; /* in bytes */ + uint8_t cluster_bits; + uint8_t l2_bits; + uint16_t padding; + uint32_t crypt_method; + uint64_t l1_table_offset; +} QEMU_PACKED QCowHeader; + +#endif diff --git a/include/block/probe.h b/include/block/probe.h index f8b0984..5230da4 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -7,5 +7,6 @@ int block_crypto_probe_luks(const uint8_t *buf, int buf_size, const char *filename); 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); #endif