@@ -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
new file mode 100644
@@ -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);
+}
@@ -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,
@@ -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