qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Maxim Levitsky <mlevitsk@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	qemu-block@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Maxim Levitsky" <mlevitsk@redhat.com>,
	"John Snow" <jsnow@redhat.com>
Subject: [PATCH v3 06/14] block/crypto: rename two functions
Date: Sun,  3 May 2020 21:43:16 +0300	[thread overview]
Message-ID: <20200503184324.12506-7-mlevitsk@redhat.com> (raw)
In-Reply-To: <20200503184324.12506-1-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>
---
 block/crypto.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/block/crypto.c b/block/crypto.c
index d379e39efb..13ca1ad891 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;
 
@@ -297,8 +296,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



  parent reply	other threads:[~2020-05-03 18:53 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-03 18:43 [PATCH v3 00/14] LUKS: encryption slot management using amend interface Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 01/14] qcrypto/core: add generic infrastructure for crypto options amendment Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 02/14] qcrypto/luks: implement encryption key management Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 03/14] block/amend: add 'force' option Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 04/14] block/amend: separate amend and create options for qemu-img Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 05/14] block/amend: refactor qcow2 amend options Maxim Levitsky
2020-05-03 18:43 ` Maxim Levitsky [this message]
2020-05-03 18:43 ` [PATCH v3 07/14] block/crypto: implement the encryption key management Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 08/14] block/qcow2: extend qemu-img amend interface with crypto options Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 09/14] iotests: filter few more luks specific create options Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 10/14] iotests: qemu-img tests for luks key management Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 11/14] block/core: add generic infrastructure for x-blockdev-amend qmp command Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 12/14] block/crypto: implement blockdev-amend Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 13/14] block/qcow2: " Maxim Levitsky
2020-05-03 18:43 ` [PATCH v3 14/14] iotests: add tests for blockdev-amend Maxim Levitsky
2020-05-03 19:43 ` [PATCH v3 00/14] LUKS: encryption slot management using amend interface no-reply
2020-05-04 10:19 ` Daniel P. Berrangé
2020-05-04 10:26   ` Maxim Levitsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200503184324.12506-7-mlevitsk@redhat.com \
    --to=mlevitsk@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).