From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Colin Lord 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> Subject: [Qemu-devel] [PATCH v3 06/32] blockdev: Move luks probe to its own file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, Colin Lord Isolates the luks probe function as part of the modularization process. Signed-off-by: Colin Lord --- 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 -- 2.5.5