[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC 1/8] crypto: Export util functions and structures
From: |
Hyman Huang |
Subject: |
[RFC 1/8] crypto: Export util functions and structures |
Date: |
Tue, 5 Dec 2023 00:06:18 +0800 |
Luks driver logic is primarily reused by Gluk, which,
therefore, exports several pre-existing functions and
structures.
Signed-off-by: Hyman Huang <yong.huang@smartx.com>
---
block/crypto.c | 16 ++++------------
block/crypto.h | 23 +++++++++++++++++++++++
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index 921933a5e5..6afae1de2e 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -34,14 +34,6 @@
#include "qemu/memalign.h"
#include "crypto.h"
-typedef struct BlockCrypto BlockCrypto;
-
-struct BlockCrypto {
- QCryptoBlock *block;
- bool updating_keys;
-};
-
-
static int block_crypto_probe_generic(QCryptoBlockFormat format,
const uint8_t *buf,
int buf_size,
@@ -321,7 +313,7 @@ static int block_crypto_open_generic(QCryptoBlockFormat
format,
}
-static int coroutine_fn GRAPH_UNLOCKED
+int coroutine_fn GRAPH_UNLOCKED
block_crypto_co_create_generic(BlockDriverState *bs, int64_t size,
QCryptoBlockCreateOptions *opts,
PreallocMode prealloc, Error **errp)
@@ -385,7 +377,7 @@ block_crypto_co_truncate(BlockDriverState *bs, int64_t
offset, bool exact,
return bdrv_co_truncate(bs->file, offset, exact, prealloc, 0, errp);
}
-static void block_crypto_close(BlockDriverState *bs)
+void block_crypto_close(BlockDriverState *bs)
{
BlockCrypto *crypto = bs->opaque;
qcrypto_block_free(crypto->block);
@@ -404,7 +396,7 @@ static int block_crypto_reopen_prepare(BDRVReopenState
*state,
*/
#define BLOCK_CRYPTO_MAX_IO_SIZE (1024 * 1024)
-static int coroutine_fn GRAPH_RDLOCK
+int coroutine_fn GRAPH_RDLOCK
block_crypto_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
QEMUIOVector *qiov, BdrvRequestFlags flags)
{
@@ -466,7 +458,7 @@ block_crypto_co_preadv(BlockDriverState *bs, int64_t
offset, int64_t bytes,
}
-static int coroutine_fn GRAPH_RDLOCK
+int coroutine_fn GRAPH_RDLOCK
block_crypto_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
QEMUIOVector *qiov, BdrvRequestFlags flags)
{
diff --git a/block/crypto.h b/block/crypto.h
index 72e792c9af..06465009f0 100644
--- a/block/crypto.h
+++ b/block/crypto.h
@@ -21,6 +21,8 @@
#ifndef BLOCK_CRYPTO_H
#define BLOCK_CRYPTO_H
+#include "crypto/block.h"
+
#define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr) \
{ \
.name = prefix BLOCK_CRYPTO_OPT_QCOW_KEY_SECRET, \
@@ -131,4 +133,25 @@ block_crypto_amend_opts_init(QDict *opts, Error **errp);
QCryptoBlockOpenOptions *
block_crypto_open_opts_init(QDict *opts, Error **errp);
+typedef struct BlockCrypto BlockCrypto;
+
+struct BlockCrypto {
+ QCryptoBlock *block;
+ bool updating_keys;
+};
+
+int coroutine_fn GRAPH_UNLOCKED
+block_crypto_co_create_generic(BlockDriverState *bs, int64_t size,
+ QCryptoBlockCreateOptions *opts,
+ PreallocMode prealloc, Error **errp);
+
+int coroutine_fn GRAPH_RDLOCK
+block_crypto_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
+ QEMUIOVector *qiov, BdrvRequestFlags flags);
+
+int coroutine_fn GRAPH_RDLOCK
+block_crypto_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
+ QEMUIOVector *qiov, BdrvRequestFlags flags);
+
+void block_crypto_close(BlockDriverState *bs);
#endif /* BLOCK_CRYPTO_H */
--
2.39.1
- [RFC 0/8] Support generic Luks encryption, Hyman Huang, 2023/12/04
- [RFC 1/8] crypto: Export util functions and structures,
Hyman Huang <=
- [RFC 2/8] crypto: Introduce payload offset set function, Hyman Huang, 2023/12/04
- [RFC 3/8] Gluks: Add the basic framework, Hyman Huang, 2023/12/04
- [RFC 4/8] Gluks: Introduce Gluks options, Hyman Huang, 2023/12/04
- [RFC 6/8] crypto: Provide the Luks crypto driver to Gluks, Hyman Huang, 2023/12/04
- [RFC 7/8] Gluks: Implement the fundamental block layer driver hooks, Hyman Huang, 2023/12/04
- [RFC 5/8] qapi: Introduce Gluks types to qapi, Hyman Huang, 2023/12/04
- [RFC 8/8] block: Support Gluks format image creation using qemu-img, Hyman Huang, 2023/12/04
- Re: [RFC 0/8] Support generic Luks encryption, Daniel P . Berrangé, 2023/12/04