On Wed, 2019-08-21 at 16:39 +0100, Daniel P. Berrangé wrote: > On Wed, Aug 14, 2019 at 11:22:07PM +0300, Maxim Levitsky wrote: > > * 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 <mlevi...@redhat.com> > > --- > > block/crypto.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/block/crypto.c b/block/crypto.c > > index 8237424ae6..42a3f0898b 100644 > > --- a/block/crypto.c > > +++ b/block/crypto.c > > @@ -51,7 +51,6 @@ static int block_crypto_probe_generic(QCryptoBlockFormat > > format, > > } > > } > > > > - > > Unrelated whitespace change > > > static ssize_t block_crypto_read_func(QCryptoBlock *block, > > size_t offset, > > uint8_t *buf, > > @@ -77,7 +76,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, > > Re-indent. > > > @@ -95,8 +94,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock > > *block, > > return ret; > > } > > > > - > > Unrelated whitespace > > > -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) > > Re-indent. > > > @@ -108,7 +106,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 > > Unrelated whitespace > > > * available to the guest, so we must take account of that > > * which will be used by the crypto header > > */ > > @@ -117,6 +116,8 @@ static ssize_t block_crypto_init_func(QCryptoBlock > > *block, > > } > > > > > > + > > + > > Unrelated whitespace > > > static QemuOptsList block_crypto_runtime_opts_luks = { > > .name = "crypto", > > .head = QTAILQ_HEAD_INITIALIZER(block_crypto_runtime_opts_luks.head), > > @@ -272,8 +273,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); > > With the whitespace changes removed & indent fixed > > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > > > Regards, > Daniel
Thanks you! Best regards, Maxim Levitsky