[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 19/32] blockdev: Separate luks probe from its dri
From: |
Colin Lord |
Subject: |
[Qemu-devel] [PATCH v3 19/32] blockdev: Separate luks probe from its driver |
Date: |
Tue, 5 Jul 2016 11:24:19 -0400 |
Completes the separation of the luks probe from the crypto driver. The
luks probe now returns the format in addition to the score, allowing
correlation of the score and driver without the probe function being
part of the driver itself.
Signed-off-by: Colin Lord <address@hidden>
---
block.c | 1 +
block/crypto.c | 1 -
block/probe/luks.c | 13 ++++++++-----
include/block/probe.h | 4 ++--
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index baef612..d936da1 100644
--- a/block.c
+++ b/block.c
@@ -63,6 +63,7 @@ typedef const char *BdrvProbeFunc(const uint8_t *buf, int
buf_size,
static BdrvProbeFunc *format_probes[] = {
bochs_probe,
cloop_probe,
+ block_crypto_probe_luks,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/crypto.c b/block/crypto.c
index 493dd69..6f37aec 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -549,7 +549,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,
diff --git a/block/probe/luks.c b/block/probe/luks.c
index 5c6427a..4c58586 100644
--- a/block/probe/luks.c
+++ b/block/probe/luks.c
@@ -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 *block_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;
}
diff --git a/include/block/probe.h b/include/block/probe.h
index 804f77c..e3bf04e 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -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 *bochs_probe(const uint8_t *buf, int buf_size,
const char *filename,
int *score);
const char *cloop_probe(const uint8_t *buf, int buf_size, const char *filename,
int *score);
+const char *block_crypto_probe_luks(const uint8_t *buf, int buf_size,
+ const char *filename, int *score);
#endif
--
2.5.5
- [Qemu-devel] [PATCH v3 13/32] blockdev: Move vdi probe to its own file, (continued)
- [Qemu-devel] [PATCH v3 13/32] blockdev: Move vdi probe to its own file, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 18/32] blockdev: Separate cloop probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 11/32] blockdev: Move qed probe to its own file, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 28/32] blockdev: Separate vmdk probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 24/32] blockdev: Separate qed probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 19/32] blockdev: Separate luks probe from its driver,
Colin Lord <=
- [Qemu-devel] [PATCH v3 14/32] blockdev: Move vhdx probe to its own file, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 23/32] blockdev: Separate qcow2 probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 26/32] blockdev: Separate vdi probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 29/32] blockdev: Separate vpc probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 31/32] blockdev: Separate out bdrv_probe_device functions, Colin Lord, 2016/07/05