[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/14] block/crypto: rename two functions
From: |
Maxim Levitsky |
Subject: |
[PATCH v2 06/14] block/crypto: rename two functions |
Date: |
Sun, 8 Mar 2020 17:18:55 +0200 |
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 | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index ecf96a7a9b..0b37dae564 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -78,12 +78,12 @@ struct BlockCryptoCreateData {
};
-static ssize_t block_crypto_write_func(QCryptoBlock *block,
- size_t offset,
- const uint8_t *buf,
- size_t buflen,
- void *opaque,
- Error **errp)
+static ssize_t block_crypto_create_write_func(QCryptoBlock *block,
+ size_t offset,
+ const uint8_t *buf,
+ size_t buflen,
+ void *opaque,
+ Error **errp)
{
struct BlockCryptoCreateData *data = opaque;
ssize_t ret;
@@ -96,11 +96,10 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block,
return ret;
}
-
-static ssize_t block_crypto_init_func(QCryptoBlock *block,
- size_t headerlen,
- void *opaque,
- Error **errp)
+static ssize_t block_crypto_create_init_func(QCryptoBlock *block,
+ size_t headerlen,
+ void *opaque,
+ Error **errp)
{
struct BlockCryptoCreateData *data = opaque;
@@ -296,8 +295,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 03/14] block/amend: add 'force' option, Maxim Levitsky, 2020/03/08
[PATCH v2 04/14] block/amend: separate amend and create options for qemu-img, Maxim Levitsky, 2020/03/08
[PATCH v2 06/14] block/crypto: rename two functions,
Maxim Levitsky <=
[PATCH v2 07/14] block/crypto: implement the encryption key management, Maxim Levitsky, 2020/03/08
[PATCH v2 08/14] block/qcow2: extend qemu-img amend interface with crypto options, Maxim Levitsky, 2020/03/08
[PATCH v2 09/14] iotests: filter few more luks specific create options, Maxim Levitsky, 2020/03/08
[PATCH v2 11/14] block/core: add generic infrastructure for x-blockdev-amend qmp command, Maxim Levitsky, 2020/03/08
[PATCH v2 10/14] iotests: qemu-img tests for luks key management, Maxim Levitsky, 2020/03/08
[PATCH v2 12/14] block/crypto: implement blockdev-amend, Maxim Levitsky, 2020/03/08
[PATCH v2 05/14] block/amend: refactor qcow2 amend options, Maxim Levitsky, 2020/03/08
[PATCH v2 13/14] block/qcow2: implement blockdev-amend, Maxim Levitsky, 2020/03/08
[PATCH v2 14/14] iotests: add tests for blockdev-amend, Maxim Levitsky, 2020/03/08
Re: [PATCH v2 00/14] LUKS: encryption slot management using amend interface, Eric Blake, 2020/03/12