[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/32] blockdev: Move luks probe to its own file
From: |
Colin Lord |
Subject: |
[Qemu-devel] [PATCH v4 06/32] blockdev: Move luks probe to its own file |
Date: |
Thu, 14 Jul 2016 15:03:02 -0400 |
Isolates the luks probe function as part of the modularization process.
Signed-off-by: Colin Lord <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/Makefile.objs | 2 +-
block/crypto-probe.c | 23 +++++++++++++++++++++++
block/crypto.c | 21 +--------------------
include/block/probe.h | 2 ++
4 files changed, 27 insertions(+), 21 deletions(-)
create mode 100644 block/crypto-probe.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 1a8d7c0..aca547f 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 += bochs-probe.o cloop-probe.o
+block-obj-y += bochs-probe.o cloop-probe.o crypto-probe.o
common-obj-y += stream.o
common-obj-y += backup.o
diff --git a/block/crypto-probe.c b/block/crypto-probe.c
new file mode 100644
index 0000000..5c6427a
--- /dev/null
+++ b/block/crypto-probe.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/block/crypto.c b/block/crypto.c
index 7eaa057..5706ba6 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,
@@ -538,13 +526,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/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
- [Qemu-devel] [PATCH v4 00/32] Dynamic module loading for block drivers, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 01/32] blockdev: prepare iSCSI block driver for dynamic loading, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 06/32] blockdev: Move luks probe to its own file,
Colin Lord <=
- [Qemu-devel] [PATCH v4 02/32] blockdev: Add dynamic generation of module_block.h, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 03/32] blockdev: Add dynamic module loading for block drivers, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 08/32] blockdev: Move parallels probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 05/32] blockdev: Move cloop probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 04/32] blockdev: Move bochs probe into separate file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 07/32] blockdev: Move dmg probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 11/32] blockdev: Move qed probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 10/32] blockdev: Move qcow2 probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 09/32] blockdev: Move qcow probe to its own file, Colin Lord, 2016/07/14
- [Qemu-devel] [PATCH v4 12/32] blockdev: Move raw probe to its own file, Colin Lord, 2016/07/14