[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 7b2935: qapi: Smarter camel_to_upper() to red
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 7b2935: qapi: Smarter camel_to_upper() to reduce need for ... |
|
Date: |
Wed, 11 Sep 2024 05:17:20 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 7b29353fdd93d062ff944785ef46fce4dd8d07c7
https://github.com/qemu/qemu/commit/7b29353fdd93d062ff944785ef46fce4dd8d07c7
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M qapi/block-core.json
M qapi/common.json
M qapi/crypto.json
M qapi/cryptodev.json
M qapi/ebpf.json
M qapi/machine.json
M qapi/migration.json
M qapi/ui.json
M scripts/qapi/common.py
M scripts/qapi/schema.py
M tests/qapi-schema/alternate-array.out
M tests/qapi-schema/comments.out
M tests/qapi-schema/doc-good.out
M tests/qapi-schema/empty.out
M tests/qapi-schema/include-repetition.out
M tests/qapi-schema/include-simple.out
M tests/qapi-schema/indented-expr.out
M tests/qapi-schema/qapi-schema-test.json
M tests/qapi-schema/qapi-schema-test.out
Log Message:
-----------
qapi: Smarter camel_to_upper() to reduce need for 'prefix'
camel_to_upper() converts its argument from camel case to upper case
with '_' between words. Used for generated enumeration constant
prefixes.
When some of the words are spelled all caps, where exactly to insert
'_' is guesswork. camel_to_upper()'s guesses are bad enough in places
to make people override them with a 'prefix' in the schema.
Rewrite it to guess better:
1. Insert '_' after a non-upper case character followed by an upper
case character:
OneTwo -> ONE_TWO
One2Three -> ONE2_THREE
2. Insert '_' before the last upper case character followed by a
non-upper case character:
ACRONYMWord -> ACRONYM_Word
Except at the beginning (as in OneTwo above), or when there is
already one:
AbCd -> AB_CD
This changes the default enumeration constant prefix for a number of
enums. Generated enumeration constants change only where the default
is not overridden with 'prefix'.
The following enumerations without a 'prefix' change:
enum old camel_to_upper()
new camel_to_upper()
------------------------------------------------------------------
DisplayGLMode DISPLAYGL_MODE
DISPLAY_GL_MODE
EbpfProgramID EBPF_PROGRAMID
EBPF_PROGRAM_ID
HmatLBDataType HMATLB_DATA_TYPE
HMAT_LB_DATA_TYPE
HmatLBMemoryHierarchy HMATLB_MEMORY_HIERARCHY
HMAT_LB_MEMORY_HIERARCHY
MultiFDCompression MULTIFD_COMPRESSION
MULTI_FD_COMPRESSION
OffAutoPCIBAR OFF_AUTOPCIBAR
OFF_AUTO_PCIBAR
QCryptoBlockFormat Q_CRYPTO_BLOCK_FORMAT
QCRYPTO_BLOCK_FORMAT
QCryptoBlockLUKSKeyslotState Q_CRYPTO_BLOCKLUKS_KEYSLOT_STATE
QCRYPTO_BLOCK_LUKS_KEYSLOT_STATE
QKeyCode Q_KEY_CODE
QKEY_CODE
XDbgBlockGraphNodeType X_DBG_BLOCK_GRAPH_NODE_TYPE
XDBG_BLOCK_GRAPH_NODE_TYPE
TestUnionEnumA TEST_UNION_ENUMA
TEST_UNION_ENUM_A
Add a 'prefix' so generated code doesn't change now. Subsequent
commits will remove most of them again. Two will remain:
MULTIFD_COMPRESSION, because migration code generally spells "multifd"
that way, and Q_KEY_CODE, because that one is baked into
subprojects/keycodemapdb/tools/keymap-gen.
The following enumerations with a 'prefix' change so that the prefix
is now superfluous:
enum old camel_to_upper()
new camel_to_upper() [equal to prefix]
------------------------------------------------------------------
BlkdebugIOType BLKDEBUGIO_TYPE
BLKDEBUG_IO_TYPE
QCryptoTLSCredsEndpoint Q_CRYPTOTLS_CREDS_ENDPOINT
QCRYPTO_TLS_CREDS_ENDPOINT
QCryptoSecretFormat Q_CRYPTO_SECRET_FORMAT
QCRYPTO_SECRET_FORMAT
QCryptoCipherMode Q_CRYPTO_CIPHER_MODE
QCRYPTO_CIPHER_MODE
QCryptodevBackendType Q_CRYPTODEV_BACKEND_TYPE
QCRYPTODEV_BACKEND_TYPE
QType [builtin] Q_TYPE
QTYPE
Drop these prefixes.
The following enumerations with a 'prefix' change without making the
'prefix' superfluous:
enum old camel_to_upper()
new camel_to_upper() [equal to prefix]
prefix
------------------------------------------------------------------
CpuS390Entitlement CPUS390_ENTITLEMENT
CPU_S390_ENTITLEMENT
S390_CPU_ENTITLEMENT
CpuS390Polarization CPUS390_POLARIZATION
CPU_S390_POLARIZATION
S390_CPU_POLARIZATION
CpuS390State CPUS390_STATE
CPU_S390_STATE
S390_CPU_STATE
QAuthZListFormat Q_AUTHZ_LIST_FORMAT
QAUTH_Z_LIST_FORMAT
QAUTHZ_LIST_FORMAT
QAuthZListPolicy Q_AUTHZ_LIST_POLICY
QAUTH_Z_LIST_POLICY
QAUTHZ_LIST_POLICY
QCryptoAkCipherAlgorithm Q_CRYPTO_AK_CIPHER_ALGORITHM
QCRYPTO_AK_CIPHER_ALGORITHM
QCRYPTO_AKCIPHER_ALG
QCryptoAkCipherKeyType Q_CRYPTO_AK_CIPHER_KEY_TYPE
QCRYPTO_AK_CIPHER_KEY_TYPE
QCRYPTO_AKCIPHER_KEY_TYPE
QCryptoCipherAlgorithm Q_CRYPTO_CIPHER_ALGORITHM
QCRYPTO_CIPHER_ALGORITHM
QCRYPTO_CIPHER_ALG
QCryptoHashAlgorithm Q_CRYPTO_HASH_ALGORITHM
QCRYPTO_HASH_ALGORITHM
QCRYPTO_HASH_ALG
QCryptoIVGenAlgorithm Q_CRYPTOIV_GEN_ALGORITHM
QCRYPTO_IV_GEN_ALGORITHM
QCRYPTO_IVGEN_ALG
QCryptoRSAPaddingAlgorithm Q_CRYPTORSA_PADDING_ALGORITHM
QCRYPTO_RSA_PADDING_ALGORITHM
QCRYPTO_RSA_PADDING_ALG
QCryptodevBackendAlgType Q_CRYPTODEV_BACKEND_ALG_TYPE
QCRYPTODEV_BACKEND_ALG_TYPE
QCRYPTODEV_BACKEND_ALG
QCryptodevBackendServiceType Q_CRYPTODEV_BACKEND_SERVICE_TYPE
QCRYPTODEV_BACKEND_SERVICE_TYPE
QCRYPTODEV_BACKEND_SERVICE
Subsequent commits will tweak things to remove most of these prefixes.
Only QAUTHZ_LIST_FORMAT and QAUTHZ_LIST_POLICY will remain.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-2-armbru@redhat.com>
Commit: a25b2312c63056a92c98c1717d0f46607842b0df
https://github.com/qemu/qemu/commit/a25b2312c63056a92c98c1717d0f46607842b0df
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M tests/qapi-schema/qapi-schema-test.json
M tests/qapi-schema/qapi-schema-test.out
M tests/unit/test-qobject-input-visitor.c
M tests/unit/test-qobject-output-visitor.c
Log Message:
-----------
tests/qapi-schema: Drop temporary 'prefix'
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added a temporary 'prefix' to delay changing the generated
code.
Revert it. This changes TestUnionEnumA's generated enumeration
constant prefix from TEST_UNION_ENUMA to TEST_UNION_ENUM_A.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240904111836.3273842-3-armbru@redhat.com>
Commit: bcd63b55b0712ae124cf1812da715fb4dceda6d5
https://github.com/qemu/qemu/commit/bcd63b55b0712ae124cf1812da715fb4dceda6d5
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M block.c
M qapi/block-core.json
Log Message:
-----------
qapi/block-core: Drop temporary 'prefix'
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added a temporary 'prefix' to delay changing the generated
code.
Revert it. This improves XDbgBlockGraphNodeType's generated
enumeration constant prefix from
X_DBG_BLOCK_GRAPH_NODE_TYPE_BLOCK_BACKEND to
XDBG_BLOCK_GRAPH_NODE_TYPE_BLOCK_BACKEND.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240904111836.3273842-4-armbru@redhat.com>
Commit: 55872c7061bc198d4bb4744c6b8be13ba0b7ed66
https://github.com/qemu/qemu/commit/55872c7061bc198d4bb4744c6b8be13ba0b7ed66
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M hw/vfio/pci.c
M qapi/common.json
Log Message:
-----------
qapi/common: Drop temporary 'prefix'
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added a temporary 'prefix' to delay changing the generated
code.
Revert it. This improves OffAutoPCIBAR's generated enumeration
constant prefix from OFF_AUTOPCIBAR to OFF_AUTO_PCIBAR.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-ID: <20240904111836.3273842-5-armbru@redhat.com>
Commit: d23d2ef3d0a72dd741b3cec330e53dd1a765b665
https://github.com/qemu/qemu/commit/d23d2ef3d0a72dd741b3cec330e53dd1a765b665
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M block/crypto.c
M block/qcow.c
M block/qcow2.c
M crypto/block-luks.c
M crypto/block.c
M qapi/crypto.json
M tests/unit/test-crypto-block.c
Log Message:
-----------
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>
Commit: 1396f2b1447e8c8388115b33128da60be41792e8
https://github.com/qemu/qemu/commit/1396f2b1447e8c8388115b33128da60be41792e8
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M ebpf/ebpf_rss.c
M qapi/ebpf.json
Log Message:
-----------
qapi/ebpf: Drop temporary 'prefix'
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added a temporary 'prefix' to delay changing the generated
code.
Revert it. This improves EbpfProgramID's generated enumeration
constant prefix from EBPF_PROGRAMID to EBPF_PROGRAM_ID.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240904111836.3273842-7-armbru@redhat.com>
Commit: 0aa4bd6aebf1dc951da5c5b762eff13c8d37f768
https://github.com/qemu/qemu/commit/0aa4bd6aebf1dc951da5c5b762eff13c8d37f768
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M hw/core/numa.c
M hw/pci-bridge/cxl_upstream.c
M qapi/machine.json
Log Message:
-----------
qapi/machine: Drop temporary 'prefix'
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added a temporary 'prefix' to delay changing the generated
code.
Revert it. This improves HmatLBDataType's generated enumeration
constant prefix from HMATLB_DATA_TYPE to HMAT_LB_DATA_TYPE, and
HmatLBMemoryHierarchy's from HMATLB_MEMORY_HIERARCHY to
HMAT_LB_MEMORY_HIERARCHY.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-ID: <20240904111836.3273842-8-armbru@redhat.com>
Commit: 154fd4d1a09c4fb53f21bce94793253eeaf279db
https://github.com/qemu/qemu/commit/154fd4d1a09c4fb53f21bce94793253eeaf279db
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M qapi/ui.json
M system/vl.c
M ui/dbus.c
M ui/egl-context.c
M ui/egl-headless.c
M ui/egl-helpers.c
M ui/gtk.c
M ui/sdl2-gl.c
M ui/sdl2.c
M ui/spice-core.c
Log Message:
-----------
qapi/ui: Drop temporary 'prefix'
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added a temporary 'prefix' to delay changing the generated
code.
Revert it. This improves DisplayGLMode's generated enumeration
constant prefix from DISPLAYGL_MODE to DISPLAY_GL_MODE.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240904111836.3273842-9-armbru@redhat.com>
Commit: 32cfefb904cae766d56adf7a802bc1ce2ddf2440
https://github.com/qemu/qemu/commit/32cfefb904cae766d56adf7a802bc1ce2ddf2440
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M hw/core/qdev-properties-system.c
M hw/s390x/cpu-topology.c
M include/hw/qdev-properties-system.h
M include/hw/s390x/cpu-topology.h
M qapi/machine-common.json
M qapi/machine-target.json
M qapi/machine.json
M qapi/pragma.json
M target/s390x/cpu.h
Log Message:
-----------
qapi/machine: Rename CpuS390* to S390Cpu*, and drop 'prefix'
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
CpuS390Entitlement has a 'prefix' to change the generated enumeration
constants' prefix from CPU_S390_ENTITLEMENT to S390_CPU_ENTITLEMENT.
Rename the type to S390CpuEntitlement, so that 'prefix' is not needed.
Likewise change CpuS390Polarization to S390CpuPolarization, and
CpuS390State to S390CpuState.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240904111836.3273842-10-armbru@redhat.com>
Commit: 5f4059ef33e927ce9f72cb60000efa156566cd5c
https://github.com/qemu/qemu/commit/5f4059ef33e927ce9f72cb60000efa156566cd5c
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M backends/cryptodev-lkcf.c
M crypto/akcipher-gcrypt.c.inc
M crypto/akcipher-nettle.c.inc
M crypto/rsakey-builtin.c.inc
M crypto/rsakey-nettle.c.inc
M qapi/crypto.json
M tests/bench/benchmark-crypto-akcipher.c
M tests/unit/test-crypto-akcipher.c
Log Message:
-----------
qapi/crypto: Drop unwanted 'prefix'
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
QCryptoAkCipherKeyType has a 'prefix' that overrides the generated
enumeration constants' prefix to QCRYPTO_AKCIPHER_KEY_TYPE.
Drop it. The prefix becomes QCRYPTO_AK_CIPHER_KEY_TYPE.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-11-armbru@redhat.com>
Commit: ef834aa2b2b52ac44ca97d70d5ef5e975a229034
https://github.com/qemu/qemu/commit/ef834aa2b2b52ac44ca97d70d5ef5e975a229034
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M backends/cryptodev-lkcf.c
M block/parallels-ext.c
M block/quorum.c
M crypto/afsplit.c
M crypto/akcipher-gcrypt.c.inc
M crypto/akcipher-nettle.c.inc
M crypto/block-luks.c
M crypto/block.c
M crypto/blockpriv.h
M crypto/hash-afalg.c
M crypto/hash-gcrypt.c
M crypto/hash-glib.c
M crypto/hash-gnutls.c
M crypto/hash-nettle.c
M crypto/hash.c
M crypto/hashpriv.h
M crypto/hmac-gcrypt.c
M crypto/hmac-glib.c
M crypto/hmac-gnutls.c
M crypto/hmac-nettle.c
M crypto/hmac.c
M crypto/hmacpriv.h
M crypto/ivgen.c
M crypto/ivgenpriv.h
M crypto/pbkdf-gcrypt.c
M crypto/pbkdf-gnutls.c
M crypto/pbkdf-nettle.c
M crypto/pbkdf-stub.c
M crypto/pbkdf.c
M crypto/x509-utils.c
M hw/misc/aspeed_hace.c
M include/crypto/afsplit.h
M include/crypto/block.h
M include/crypto/hash.h
M include/crypto/hmac.h
M include/crypto/ivgen.h
M include/crypto/pbkdf.h
M include/crypto/x509-utils.h
M io/channel-websock.c
M qapi/crypto.json
M target/i386/sev.c
M tests/bench/benchmark-crypto-akcipher.c
M tests/bench/benchmark-crypto-hash.c
M tests/bench/benchmark-crypto-hmac.c
M tests/unit/test-crypto-afsplit.c
M tests/unit/test-crypto-akcipher.c
M tests/unit/test-crypto-block.c
M tests/unit/test-crypto-hash.c
M tests/unit/test-crypto-hmac.c
M tests/unit/test-crypto-ivgen.c
M tests/unit/test-crypto-pbkdf.c
M ui/vnc.c
M util/hbitmap.c
Log Message:
-----------
qapi/crypto: Rename QCryptoHashAlgorithm to *Algo, and drop prefix
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
QCryptoHashAlgorithm has a 'prefix' that overrides the generated
enumeration constants' prefix to QCRYPTO_HASH_ALG.
We could simply drop 'prefix', but then the prefix becomes
QCRYPTO_HASH_ALGORITHM, which is rather long.
We could additionally rename the type to QCryptoHashAlg, but I think
the abbreviation "alg" is less than clear.
Rename the type to QCryptoHashAlgo instead. The prefix becomes to
QCRYPTO_HASH_ALGO.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-12-armbru@redhat.com>
[Conflicts with merge commit 7bbadc60b58b resolved]
Commit: a092c513dbb1e504ed1556e70ad263df54016e78
https://github.com/qemu/qemu/commit/a092c513dbb1e504ed1556e70ad263df54016e78
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M block/rbd.c
M crypto/block-luks.c
M crypto/block-qcow.c
M crypto/block.c
M crypto/blockpriv.h
M crypto/cipher-afalg.c
M crypto/cipher-builtin.c.inc
M crypto/cipher-gcrypt.c.inc
M crypto/cipher-gnutls.c.inc
M crypto/cipher-nettle.c.inc
M crypto/cipher.c
M crypto/cipherpriv.h
M crypto/ivgen.c
M crypto/ivgenpriv.h
M crypto/secret_common.c
M include/crypto/cipher.h
M include/crypto/ivgen.h
M include/crypto/pbkdf.h
M qapi/block-core.json
M qapi/crypto.json
M tests/bench/benchmark-crypto-cipher.c
M tests/unit/test-crypto-block.c
M tests/unit/test-crypto-cipher.c
M tests/unit/test-crypto-ivgen.c
M ui/vnc.c
Log Message:
-----------
qapi/crypto: Rename QCryptoCipherAlgorithm to *Algo, and drop prefix
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>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-13-armbru@redhat.com>
Commit: 5e0e510246816ec2d3e1acf56df10abc4b13a775
https://github.com/qemu/qemu/commit/5e0e510246816ec2d3e1acf56df10abc4b13a775
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M crypto/block-luks.c
M crypto/block-qcow.c
M crypto/ivgen.c
M crypto/ivgenpriv.h
M include/crypto/ivgen.h
M qapi/crypto.json
M tests/unit/test-crypto-block.c
M tests/unit/test-crypto-ivgen.c
Log Message:
-----------
qapi/crypto: Rename QCryptoIVGenAlgorithm to *Algo, and drop prefix
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
QCryptoIVGenAlgorithm has a 'prefix' that overrides the generated
enumeration constants' prefix to QCRYPTO_IVGEN_ALG.
We could simply drop 'prefix', but then the prefix becomes
QCRYPTO_IV_GEN_ALGORITHM, which is rather long.
We could additionally rename the type to QCryptoIVGenAlg, but I think
the abbreviation "alg" is less than clear.
Rename the type to QCryptoIVGenAlgo instead. The prefix becomes
QCRYPTO_IV_GEN_ALGO.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-14-armbru@redhat.com>
Commit: cd48d82a5068fe038719eeff8d3eab555e1f3bbb
https://github.com/qemu/qemu/commit/cd48d82a5068fe038719eeff8d3eab555e1f3bbb
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M backends/cryptodev-lkcf.c
M crypto/akcipher-gcrypt.c.inc
M crypto/akcipher-nettle.c.inc
M crypto/akcipher.c
M crypto/akcipherpriv.h
M qapi/crypto.json
M tests/bench/benchmark-crypto-akcipher.c
M tests/unit/test-crypto-akcipher.c
Log Message:
-----------
qapi/crypto: Rename QCryptoAkCipherAlgorithm to *Algo, and drop prefix
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
QCryptoAkCipherAlgorithm has a 'prefix' that overrides the generated
enumeration constants' prefix to QCRYPTO_AKCIPHER_ALG.
We could simply drop 'prefix', but then the prefix becomes
QCRYPTO_AK_CIPHER_ALGORITHM, which is rather long.
We could additionally rename the type to QCryptoAkCipherAlg, but I
think the abbreviation "alg" is less than clear.
Rename the type to QCryptoAkCipherAlgo instead. The prefix becomes
QCRYPTO_AK_CIPHER_ALGO.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-15-armbru@redhat.com>
Commit: c96050f43e35012331abfb5aa347fa6543826d0e
https://github.com/qemu/qemu/commit/c96050f43e35012331abfb5aa347fa6543826d0e
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M backends/cryptodev-lkcf.c
M crypto/akcipher-gcrypt.c.inc
M crypto/akcipher-nettle.c.inc
M qapi/crypto.json
M tests/bench/benchmark-crypto-akcipher.c
M tests/unit/test-crypto-akcipher.c
Log Message:
-----------
qapi/crypto: Rename QCryptoRSAPaddingAlgorithm to *Algo, and drop prefix
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
QCryptoRSAPaddingAlgorithm has a 'prefix' that overrides the generated
enumeration constants' prefix to QCRYPTO_RSA_PADDING_ALG.
We could simply drop 'prefix', but then the prefix becomes
QCRYPTO_RSA_PADDING_ALGORITHM, which is rather long.
We could additionally rename the type to QCryptoRSAPaddingAlg, but I
think the abbreviation "alg" is less than clear.
Rename the type to QCryptoRSAPaddingAlgo instead. The prefix becomes
QCRYPTO_RSA_PADDING_ALGO.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-16-armbru@redhat.com>
Commit: 8f525028bc6f52e4af3f737928d16c3f39a6ea54
https://github.com/qemu/qemu/commit/8f525028bc6f52e4af3f737928d16c3f39a6ea54
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M crypto/afalg.c
M crypto/afalgpriv.h
M crypto/cipher-afalg.c
M crypto/hash-afalg.c
M crypto/hmacpriv.h
Log Message:
-----------
qapi/crypto: Rename QCryptoAFAlg to QCryptoAFAlgo
For consistency with other types names *Algo.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-17-armbru@redhat.com>
Commit: d0917d79fd0d239348a8a02f18dea6c4b77caabd
https://github.com/qemu/qemu/commit/d0917d79fd0d239348a8a02f18dea6c4b77caabd
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M backends/cryptodev-lkcf.c
M backends/cryptodev-vhost-user.c
M backends/cryptodev.c
M hw/virtio/virtio-crypto.c
M qapi/cryptodev.json
Log Message:
-----------
qapi/cryptodev: Drop unwanted 'prefix'
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
QCryptodevBackendServiceType has a 'prefix' that overrides the
generated enumeration constants' prefix to QCRYPTODEV_BACKEND_SERVICE.
Drop it. The prefix becomes QCRYPTODEV_BACKEND_SERVICE_TYPE.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-18-armbru@redhat.com>
Commit: b1019999e86ca816eb1754ff8b907a61ae294969
https://github.com/qemu/qemu/commit/b1019999e86ca816eb1754ff8b907a61ae294969
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M backends/cryptodev-lkcf.c
M backends/cryptodev.c
M hw/virtio/virtio-crypto.c
M include/sysemu/cryptodev.h
M qapi/cryptodev.json
Log Message:
-----------
qapi/cryptodev: Rename QCryptodevBackendAlgType to *Algo, and drop prefix
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
QCryptodevBackendAlgType has a 'prefix' that overrides the generated
enumeration constants' prefix to QCRYPTODEV_BACKEND_ALG.
We could simply drop 'prefix', but I think the abbreviation "alg" is
less than clear.
Additionally rename the type to QCryptodevBackendAlgoType. The prefix
becomes QCRYPTODEV_BACKEND_ALGO_TYPE.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240904111836.3273842-19-armbru@redhat.com>
Commit: 64f5e9db7706c8f4a7d7b521596caae9a1106337
https://github.com/qemu/qemu/commit/64f5e9db7706c8f4a7d7b521596caae9a1106337
Author: Markus Armbruster <armbru@redhat.com>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M hw/vfio/migration.c
M qapi/vfio.json
Log Message:
-----------
qapi/vfio: Rename VfioMigrationState to Qapi*, and drop prefix
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
VfioMigrationState has a 'prefix' that overrides the generated
enumeration constants' prefix to QAPI_VFIO_MIGRATION_STATE.
We could simply drop 'prefix', but then the enumeration constants
would look as if they came from kernel header linux/vfio.h.
Rename the type to QapiVfioMigrationState instead, so that 'prefix' is
not needed.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240904111836.3273842-20-armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Commit: b8eada54b2ad8a7d98d93d5ab4d3e888c5880097
https://github.com/qemu/qemu/commit/b8eada54b2ad8a7d98d93d5ab4d3e888c5880097
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2024-09-10 (Tue, 10 Sep 2024)
Changed paths:
M backends/cryptodev-builtin.c
M backends/cryptodev-lkcf.c
M backends/cryptodev-vhost-user.c
M backends/cryptodev.c
M block.c
M block/crypto.c
M block/parallels-ext.c
M block/qcow.c
M block/qcow2.c
M block/quorum.c
M block/rbd.c
M crypto/afalg.c
M crypto/afalgpriv.h
M crypto/afsplit.c
M crypto/akcipher-gcrypt.c.inc
M crypto/akcipher-nettle.c.inc
M crypto/akcipher.c
M crypto/akcipherpriv.h
M crypto/block-luks.c
M crypto/block-qcow.c
M crypto/block.c
M crypto/blockpriv.h
M crypto/cipher-afalg.c
M crypto/cipher-builtin.c.inc
M crypto/cipher-gcrypt.c.inc
M crypto/cipher-gnutls.c.inc
M crypto/cipher-nettle.c.inc
M crypto/cipher.c
M crypto/cipherpriv.h
M crypto/hash-afalg.c
M crypto/hash-gcrypt.c
M crypto/hash-glib.c
M crypto/hash-gnutls.c
M crypto/hash-nettle.c
M crypto/hash.c
M crypto/hashpriv.h
M crypto/hmac-gcrypt.c
M crypto/hmac-glib.c
M crypto/hmac-gnutls.c
M crypto/hmac-nettle.c
M crypto/hmac.c
M crypto/hmacpriv.h
M crypto/ivgen.c
M crypto/ivgenpriv.h
M crypto/pbkdf-gcrypt.c
M crypto/pbkdf-gnutls.c
M crypto/pbkdf-nettle.c
M crypto/pbkdf-stub.c
M crypto/pbkdf.c
M crypto/rsakey-builtin.c.inc
M crypto/rsakey-nettle.c.inc
M crypto/secret_common.c
M crypto/x509-utils.c
M ebpf/ebpf_rss.c
M hw/core/numa.c
M hw/core/qdev-properties-system.c
M hw/misc/aspeed_hace.c
M hw/pci-bridge/cxl_upstream.c
M hw/s390x/cpu-topology.c
M hw/vfio/migration.c
M hw/vfio/pci.c
M hw/virtio/virtio-crypto.c
M include/crypto/afsplit.h
M include/crypto/block.h
M include/crypto/cipher.h
M include/crypto/hash.h
M include/crypto/hmac.h
M include/crypto/ivgen.h
M include/crypto/pbkdf.h
M include/crypto/x509-utils.h
M include/hw/qdev-properties-system.h
M include/hw/s390x/cpu-topology.h
M include/sysemu/cryptodev.h
M io/channel-websock.c
M qapi/block-core.json
M qapi/crypto.json
M qapi/cryptodev.json
M qapi/machine-common.json
M qapi/machine-target.json
M qapi/machine.json
M qapi/migration.json
M qapi/pragma.json
M qapi/ui.json
M qapi/vfio.json
M scripts/qapi/common.py
M scripts/qapi/schema.py
M system/vl.c
M target/i386/sev.c
M target/s390x/cpu.h
M tests/bench/benchmark-crypto-akcipher.c
M tests/bench/benchmark-crypto-cipher.c
M tests/bench/benchmark-crypto-hash.c
M tests/bench/benchmark-crypto-hmac.c
M tests/qapi-schema/alternate-array.out
M tests/qapi-schema/comments.out
M tests/qapi-schema/doc-good.out
M tests/qapi-schema/empty.out
M tests/qapi-schema/include-repetition.out
M tests/qapi-schema/include-simple.out
M tests/qapi-schema/indented-expr.out
M tests/qapi-schema/qapi-schema-test.out
M tests/unit/test-crypto-afsplit.c
M tests/unit/test-crypto-akcipher.c
M tests/unit/test-crypto-block.c
M tests/unit/test-crypto-cipher.c
M tests/unit/test-crypto-hash.c
M tests/unit/test-crypto-hmac.c
M tests/unit/test-crypto-ivgen.c
M tests/unit/test-crypto-pbkdf.c
M tests/unit/test-qobject-input-visitor.c
M tests/unit/test-qobject-output-visitor.c
M ui/dbus.c
M ui/egl-context.c
M ui/egl-headless.c
M ui/egl-helpers.c
M ui/gtk.c
M ui/sdl2-gl.c
M ui/sdl2.c
M ui/spice-core.c
M ui/vnc.c
M util/hbitmap.c
Log Message:
-----------
Merge tag 'pull-qapi-2024-09-10' of https://repo.or.cz/qemu/armbru into
staging
QAPI patches patches for 2024-09-10
# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmbgS0ASHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTm+sP/1kEuGdbjjVLQC7U+gCClhALpYUtIMHQ
# qNZWmnxFyW9Jx6Lk8+FZBRJegNlmA9AJ2ZzD/2I/WoNtcrNiE53rIRG71Lcy8I6U
# CRjekLPn0jhFuYhmRfwz6ilcLkyMJ15Yi7iG6ssFsO1joBtU5Q1qpzQmFUl9UbV9
# 9iBe7mE99VzNwi3hMELEM9YuSgAs8st4Itnn8SiHkJ3s6hlmF8N4HwNKfQrseGfb
# FuJNN4p8Gcu0aF/dkGE8ADJBvtgzkFnavXt0GQPC7SjGOF7rUXxnUQlszNZM0OcK
# UAfWU06sIyiOholQQt8H8jawT+rGCLomfgPUBVq5K8WByd21IeQeS0upSPeTjxS+
# d/C8wzpcbhdNOECwC/wDtgZHvCC95cHNrxuC4+4/Q1KIVVr+1cWqe8hQzFvm3TIg
# dduEFTQDIxhpE0GO1ZWNf90upzBYBWwIsh4bqsMZS7SpaYIZ6QV45yViZ1w2WfbH
# m3/F34Z3yqgFuZQrZv4OPo7xHK0+y7uZ60RrhSJtE0X080syRJKBbGmNBRidoVyu
# JOONWH44I/XN5enZV8StJnqJr9MCV0DBZUCi9ZhP/kAhBjLc5cQ6NByEa9/rebYX
# 1bLTiA1JDLzDVIan+A8dz0riWmHBvTyBwhLnEXvXb9lcB3ozgHTb7axE5RnZSYLI
# YQgBOBMFuQKM
# =YO/Q
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 10 Sep 2024 14:36:00 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* tag 'pull-qapi-2024-09-10' of https://repo.or.cz/qemu/armbru:
qapi/vfio: Rename VfioMigrationState to Qapi*, and drop prefix
qapi/cryptodev: Rename QCryptodevBackendAlgType to *Algo, and drop prefix
qapi/cryptodev: Drop unwanted 'prefix'
qapi/crypto: Rename QCryptoAFAlg to QCryptoAFAlgo
qapi/crypto: Rename QCryptoRSAPaddingAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoAkCipherAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoIVGenAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoCipherAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoHashAlgorithm to *Algo, and drop prefix
qapi/crypto: Drop unwanted 'prefix'
qapi/machine: Rename CpuS390* to S390Cpu*, and drop 'prefix'
qapi/ui: Drop temporary 'prefix'
qapi/machine: Drop temporary 'prefix'
qapi/ebpf: Drop temporary 'prefix'
qapi/crypto: Drop temporary 'prefix'
qapi/common: Drop temporary 'prefix'
qapi/block-core: Drop temporary 'prefix'
tests/qapi-schema: Drop temporary 'prefix'
qapi: Smarter camel_to_upper() to reduce need for 'prefix'
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/a66f28df6501...b8eada54b2ad
To unsubscribe from these emails, change your notification settings at
https://github.com/qemu/qemu/settings/notifications