From patchwork Tue Jul 5 15:24: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: 9214589 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 4CC256048F for ; Tue, 5 Jul 2016 15:25:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F22326212 for ; Tue, 5 Jul 2016 15:25:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33B4526247; Tue, 5 Jul 2016 15:25:43 +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 CDB5226212 for ; Tue, 5 Jul 2016 15:25:42 +0000 (UTC) Received: from localhost ([::1]:55795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSEI-0006Pk-0M for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:25:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDO-0005wR-Tc for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDL-0008P3-6J for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48282) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDG-0008LD-Vr; Tue, 05 Jul 2016 11:24:39 -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 7EF75201EA; Tue, 5 Jul 2016 15:24:38 +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 u65FOWu2006841; Tue, 5 Jul 2016 11:24:37 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:06 -0400 Message-Id: <1467732272-23368-7-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.29]); Tue, 05 Jul 2016 15:24: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 v3 06/32] blockdev: Move luks 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 the luks probe function as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/crypto.c | 21 +-------------------- block/probe/luks.c | 23 +++++++++++++++++++++++ include/block/probe.h | 2 ++ 4 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 block/probe/luks.c diff --git a/block/Makefile.objs b/block/Makefile.objs index 3b98001..28a7ec3 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -24,7 +24,7 @@ block-obj-y += accounting.o dirty-bitmap.o block-obj-y += write-threshold.o block-obj-y += crypto.o -block-obj-y += probe/bochs.o probe/cloop.o +block-obj-y += probe/bochs.o probe/cloop.o probe/luks.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/crypto.c b/block/crypto.c index 758e14e..493dd69 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "block/block_int.h" +#include "block/probe.h" #include "sysemu/block-backend.h" #include "crypto/block.h" #include "qapi/opts-visitor.h" @@ -41,19 +42,6 @@ struct BlockCrypto { }; -static int block_crypto_probe_generic(QCryptoBlockFormat format, - const uint8_t *buf, - int buf_size, - const char *filename) -{ - if (qcrypto_block_has_format(format, buf, buf_size)) { - return 100; - } else { - return 0; - } -} - - static ssize_t block_crypto_read_func(QCryptoBlock *block, size_t offset, uint8_t *buf, @@ -540,13 +528,6 @@ static int64_t block_crypto_getlength(BlockDriverState *bs) } -static int block_crypto_probe_luks(const uint8_t *buf, - int buf_size, - const char *filename) { - return block_crypto_probe_generic(Q_CRYPTO_BLOCK_FORMAT_LUKS, - buf, buf_size, filename); -} - static int block_crypto_open_luks(BlockDriverState *bs, QDict *options, int flags, diff --git a/block/probe/luks.c b/block/probe/luks.c new file mode 100644 index 0000000..5c6427a --- /dev/null +++ b/block/probe/luks.c @@ -0,0 +1,23 @@ +#include "qemu/osdep.h" +#include "qapi-types.h" +#include "block/probe.h" +#include "crypto/block.h" + +static int block_crypto_probe_generic(QCryptoBlockFormat format, + const uint8_t *buf, + int buf_size, + const char *filename) +{ + if (qcrypto_block_has_format(format, buf, buf_size)) { + return 100; + } else { + return 0; + } +} + +int block_crypto_probe_luks(const uint8_t *buf, + int buf_size, + const char *filename) { + return block_crypto_probe_generic(Q_CRYPTO_BLOCK_FORMAT_LUKS, + buf, buf_size, filename); +} diff --git a/include/block/probe.h b/include/block/probe.h index ed1a60b..35a8d00 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -3,5 +3,7 @@ int bochs_probe(const uint8_t *buf, int buf_size, const char *filename); int cloop_probe(const uint8_t *buf, int buf_size, const char *filename); +int block_crypto_probe_luks(const uint8_t *buf, int buf_size, + const char *filename); #endif