[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/18] block/crypto: rename two functions
From: |
Max Reitz |
Subject: |
[PULL 09/18] block/crypto: rename two functions |
Date: |
Mon, 22 Jun 2020 17:10:50 +0200 |
From: Maxim Levitsky <mlevitsk@redhat.com>
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 <mlevitsk@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200608094030.670121-7-mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/crypto.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index dcf8b42bb2..1960b47ceb 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -79,12 +79,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;
@@ -97,11 +97,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;
Error *local_error = NULL;
@@ -313,8 +312,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.26.2
- [PULL 00/18] Block patches, Max Reitz, 2020/06/22
- [PULL 01/18] iotests: Make _filter_img_create more active, Max Reitz, 2020/06/22
- [PULL 03/18] block/block-copy: block_copy_dirty_clusters: fix failure check, Max Reitz, 2020/06/22
- [PULL 07/18] block/amend: separate amend and create options for qemu-img, Max Reitz, 2020/06/22
- [PULL 10/18] block/crypto: implement the encryption key management, Max Reitz, 2020/06/22
- [PULL 02/18] iotests: filter few more luks specific create options, Max Reitz, 2020/06/22
- [PULL 09/18] block/crypto: rename two functions,
Max Reitz <=
- [PULL 05/18] qcrypto/luks: implement encryption key management, Max Reitz, 2020/06/22
- [PULL 06/18] block/amend: add 'force' option, Max Reitz, 2020/06/22
- [PULL 04/18] qcrypto/core: add generic infrastructure for crypto options amendment, Max Reitz, 2020/06/22
- [PULL 08/18] block/amend: refactor qcow2 amend options, Max Reitz, 2020/06/22
- [PULL 11/18] block/qcow2: extend qemu-img amend interface with crypto options, Max Reitz, 2020/06/22
- [PULL 14/18] block/crypto: implement blockdev-amend, Max Reitz, 2020/06/22
- [PULL 18/18] iotests: don't test qcow2.py inside 291, Max Reitz, 2020/06/22
- [PULL 13/18] block/core: add generic infrastructure for x-blockdev-amend qmp command, Max Reitz, 2020/06/22
- [PULL 12/18] iotests: qemu-img tests for luks key management, Max Reitz, 2020/06/22
- [PULL 17/18] iotests: Fix 051 output after qdev_init_nofail() removal, Max Reitz, 2020/06/22