Re: [PATCH 12/18] qapi/crypto: Rename QCryptoCipherAlgorithm to *Algo, and drop prefix

[Daniel P . Berrangé]

On Tue, Jul 30, 2024 at 10:10:26AM +0200, Markus Armbruster wrote:
> QAPI's 'prefix' feature can make the connection between enumeration
> type and its constants less than obvious.  It's best used with
> restraint.
> 
> QCryptoCipherAlgorithm has a 'prefix' that overrides the generated
> enumeration constants' prefix to QCRYPTO_CIPHER_ALG.
> 
> We could simply drop 'prefix', but then the prefix becomes
> QCRYPTO_CIPHER_ALGORITHM, which is rather long.
> 
> We could additionally rename the type to QCryptoCipherAlg, but I think
> the abbreviation "alg" is less than clear.
> 
> Rename the type to QCryptoCipherAlgo instead.  The prefix becomes
> QCRYPTO_CIPHER_ALGO.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  qapi/block-core.json                  |  2 +-
>  qapi/crypto.json                      |  9 ++-
>  crypto/blockpriv.h                    |  4 +-
>  crypto/cipherpriv.h                   |  2 +-
>  crypto/ivgenpriv.h                    |  2 +-
>  include/crypto/cipher.h               | 18 +++---
>  include/crypto/ivgen.h                | 10 +--
>  include/crypto/pbkdf.h                |  4 +-
>  backends/cryptodev-builtin.c          | 16 ++---
>  block/rbd.c                           |  4 +-
>  crypto/block-luks.c                   | 92 +++++++++++++--------------
>  crypto/block-qcow.c                   |  4 +-
>  crypto/block.c                        |  2 +-
>  crypto/cipher-afalg.c                 | 24 +++----
>  crypto/cipher.c                       | 72 ++++++++++-----------
>  crypto/ivgen.c                        |  4 +-
>  crypto/secret_common.c                |  2 +-
>  tests/bench/benchmark-crypto-cipher.c | 22 +++----
>  tests/unit/test-crypto-block.c        | 14 ++--
>  tests/unit/test-crypto-cipher.c       | 66 +++++++++----------
>  tests/unit/test-crypto-ivgen.c        |  8 +--
>  ui/vnc.c                              |  4 +-
>  crypto/cipher-builtin.c.inc           | 18 +++---
>  crypto/cipher-gcrypt.c.inc            | 56 ++++++++--------
>  crypto/cipher-gnutls.c.inc            | 38 +++++------
>  crypto/cipher-nettle.c.inc            | 58 ++++++++---------
>  26 files changed, 277 insertions(+), 278 deletions(-)

Acked-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|