[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/13] block-crypto: misc refactoring
From: |
Maxim Levitsky |
Subject: |
[PATCH v2 01/13] block-crypto: misc refactoring |
Date: |
Thu, 26 Sep 2019 00:35:15 +0300 |
* rename the write_func to create_write_func,
and init_func to create_init_func
this is preparation for other write_func that will
be used to update the encryption keys.
No functional changes
Signed-off-by: Maxim Levitsky <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
block/crypto.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index 7eb698774e..6e822c6e50 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -78,7 +78,7 @@ struct BlockCryptoCreateData {
};
-static ssize_t block_crypto_write_func(QCryptoBlock *block,
+static ssize_t block_crypto_create_write_func(QCryptoBlock *block,
size_t offset,
const uint8_t *buf,
size_t buflen,
@@ -96,8 +96,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block,
return ret;
}
-
-static ssize_t block_crypto_init_func(QCryptoBlock *block,
+static ssize_t block_crypto_create_init_func(QCryptoBlock *block,
size_t headerlen,
void *opaque,
Error **errp)
@@ -109,7 +108,8 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block,
return -EFBIG;
}
- /* User provided size should reflect amount of space made
+ /*
+ * User provided size should reflect amount of space made
* available to the guest, so we must take account of that
* which will be used by the crypto header
*/
@@ -279,8 +279,8 @@ static int block_crypto_co_create_generic(BlockDriverState
*bs,
};
crypto = qcrypto_block_create(opts, NULL,
- block_crypto_init_func,
- block_crypto_write_func,
+ block_crypto_create_init_func,
+ block_crypto_create_write_func,
&data,
errp);
--
2.17.2
- [PATCH v2 00/13] crypto/luks: preparation for encryption key managment, Maxim Levitsky, 2019/09/25
- [PATCH v2 01/13] block-crypto: misc refactoring,
Maxim Levitsky <=
- [PATCH v2 02/13] qcrypto-luks: rename some fields in QCryptoBlockLUKSHeader, Maxim Levitsky, 2019/09/25
- [PATCH v2 03/13] qcrypto-luks: don't overwrite cipher_mode in header, Maxim Levitsky, 2019/09/25
- [PATCH v2 04/13] qcrypto-luks: simplify masterkey and masterkey length, Maxim Levitsky, 2019/09/25
- [PATCH v2 05/13] qcrypto-luks: pass keyslot index rather that pointer to the keyslot, Maxim Levitsky, 2019/09/25
- [PATCH v2 06/13] qcrypto-luks: use the parsed encryption settings in QCryptoBlockLUKS, Maxim Levitsky, 2019/09/25
- [PATCH v2 07/13] qcrypto-luks: purge unused error codes from open callback, Maxim Levitsky, 2019/09/25
- [PATCH v2 08/13] qcrypto-luks: extract store and load header, Maxim Levitsky, 2019/09/25
- [PATCH v2 09/13] qcrypto-luks: extract check and parse header, Maxim Levitsky, 2019/09/25