diff options
| author | Markus Armbruster <armbru@redhat.com> | 2024-09-04 13:18:22 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2024-09-10 13:22:47 +0200 |
| commit | d23d2ef3d0a72dd741b3cec330e53dd1a765b665 (patch) | |
| tree | 088f56d60419e95ba277439eb45f3c6b2c36cb76 /crypto | |
| parent | 55872c7061bc198d4bb4744c6b8be13ba0b7ed66 (diff) | |
| download | qemu-d23d2ef3d0a72dd741b3cec330e53dd1a765b665.zip qemu-d23d2ef3d0a72dd741b3cec330e53dd1a765b665.tar.gz qemu-d23d2ef3d0a72dd741b3cec330e53dd1a765b665.tar.bz2 | |
qapi/crypto: Drop temporary 'prefix'
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added two temporary 'prefix' to delay changing the generated
code.
Revert them. This improves QCryptoBlockFormat's generated enumeration
constant prefix from Q_CRYPTO_BLOCK_FORMAT to QCRYPTO_BLOCK_FORMAT,
and QCryptoBlockLUKSKeyslotState's from
Q_CRYPTO_BLOCKLUKS_KEYSLOT_STATE to QCRYPTO_BLOCK_LUKS_KEYSLOT_STATE.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-6-armbru@redhat.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/block-luks.c | 4 | ||||
| -rw-r--r-- | crypto/block.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 45347ad..7b9c7b2 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -1861,11 +1861,11 @@ qcrypto_block_luks_amend_options(QCryptoBlock *block, QCryptoBlockAmendOptionsLUKS *opts_luks = &options->u.luks; switch (opts_luks->state) { - case Q_CRYPTO_BLOCKLUKS_KEYSLOT_STATE_ACTIVE: + case QCRYPTO_BLOCK_LUKS_KEYSLOT_STATE_ACTIVE: return qcrypto_block_luks_amend_add_keyslot(block, readfunc, writefunc, opaque, opts_luks, force, errp); - case Q_CRYPTO_BLOCKLUKS_KEYSLOT_STATE_INACTIVE: + case QCRYPTO_BLOCK_LUKS_KEYSLOT_STATE_INACTIVE: return qcrypto_block_luks_amend_erase_keyslots(block, readfunc, writefunc, opaque, opts_luks, force, errp); diff --git a/crypto/block.c b/crypto/block.c index 3bcc427..899561a 100644 --- a/crypto/block.c +++ b/crypto/block.c @@ -26,8 +26,8 @@ #include "block-luks.h" static const QCryptoBlockDriver *qcrypto_block_drivers[] = { - [Q_CRYPTO_BLOCK_FORMAT_QCOW] = &qcrypto_block_driver_qcow, - [Q_CRYPTO_BLOCK_FORMAT_LUKS] = &qcrypto_block_driver_luks, + [QCRYPTO_BLOCK_FORMAT_QCOW] = &qcrypto_block_driver_qcow, + [QCRYPTO_BLOCK_FORMAT_LUKS] = &qcrypto_block_driver_luks, }; |