@@ -63,6 +63,7 @@ typedef const char *BdrvProbeFunc(const uint8_t *buf, int buf_size,
static BdrvProbeFunc *format_probes[] = {
bdrv_bochs_probe,
bdrv_cloop_probe,
+ bdrv_crypto_probe_luks,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
@@ -15,9 +15,12 @@ static int block_crypto_probe_generic(QCryptoBlockFormat format,
}
}
-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);
+const char *bdrv_crypto_probe_luks(const uint8_t *buf, int buf_size,
+ const char *filename, int *score)
+{
+ const char *format = "luks";
+ assert(score);
+ *score = block_crypto_probe_generic(Q_CRYPTO_BLOCK_FORMAT_LUKS,
+ buf, buf_size, filename);
+ return format;
}
@@ -547,7 +547,6 @@ static int block_crypto_create_luks(const char *filename,
BlockDriver bdrv_crypto_luks = {
.format_name = "luks",
.instance_size = sizeof(BlockCrypto),
- .bdrv_probe = block_crypto_probe_luks,
.bdrv_open = block_crypto_open_luks,
.bdrv_close = block_crypto_close,
.bdrv_create = block_crypto_create_luks,
@@ -1,8 +1,6 @@
#ifndef PROBE_H
#define PROBE_H
-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);
@@ -17,5 +15,7 @@ const char *bdrv_bochs_probe(const uint8_t *buf, int buf_size,
const char *filename, int *score);
const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size,
const char *filename, int *score);
+const char *bdrv_crypto_probe_luks(const uint8_t *buf, int buf_size,
+ const char *filename, int *score);
#endif