From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, andrew@codeconstruct.com.au,
andrew@daynix.com, arei.gonglei@huawei.com, berrange@redhat.com,
berto@igalia.com, borntraeger@linux.ibm.com, clg@kaod.org,
david@redhat.com, den@openvz.org, eblake@redhat.com,
eduardo@habkost.net, farman@linux.ibm.com, farosas@suse.de,
hreitz@redhat.com, idryomov@gmail.com, iii@linux.ibm.com,
jamin_lin@aspeedtech.com, jasowang@redhat.com, joel@jms.id.au,
jsnow@redhat.com, kwolf@redhat.com, leetroy@gmail.com,
marcandre.lureau@redhat.com, marcel.apfelbaum@gmail.com,
michael.roth@amd.com, mst@redhat.com, mtosatti@redhat.com,
nsg@linux.ibm.com, pasic@linux.ibm.com, pbonzini@redhat.com,
peter.maydell@linaro.org, peterx@redhat.com, philmd@linaro.org,
pizhenwei@bytedance.com, pl@dlhnet.de,
richard.henderson@linaro.org, stefanha@redhat.com,
steven_lee@aspeedtech.com, thuth@redhat.com,
vsementsov@yandex-team.ru, wangyanan55@huawei.com,
yuri.benditovich@daynix.com, zhao1.liu@intel.com,
qemu-block@nongnu.org, qemu-arm@nongnu.org,
qemu-s390x@nongnu.org, kvm@vger.kernel.org, avihaih@nvidia.com
Subject: [PATCH v2 00/19] qapi: Reduce use of 'prefix'
Date: Wed, 4 Sep 2024 13:18:17 +0200 [thread overview]
Message-ID: <20240904111836.3273842-1-armbru@redhat.com> (raw)
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious. It's best used with
restraint.
We use 'prefix' for a number of reasons:
* To override an ugly default.
* To shorten the prefix.
* To work around name clashes.
This series attacks the first two. It additionally improves a number
of ugly prefixes we don't override.
PATCH 01 improves the default prefix, and drops 'prefix' where it is
now redundant. The patch adds temporary 'prefix' to not change
generated code.
PATCH 02-08 revert the temporary 'prefix'.
PATCH 10,17 drop 'prefix' where the default is now better.
PATCH 09,11-15,18,19 rename QAPI types, and drop their 'prefix'. I'm
prepared to adjust the renames according to maintainers' preference.
PATCH 16 renames a non-QAPI type for consistency.
v2:
* PATCH 01: Fix camel_to_upper() to avoid '__' and leading '_'.
* PATCH 01+07: Actually add a 'prefix' to HmatLBMemoryHierarchy in
PATCH 01, as the commit message advertizes. Remove it in PATCH 07,
and adjust the commit message.
* PATCH 09: Keep pragma documentation-exceptions sorted.
* PATCH 04+09+18: Fix commit message typos.
* PATCH 19: New.
Markus Armbruster (19):
qapi: Smarter camel_to_upper() to reduce need for 'prefix'
tests/qapi-schema: Drop temporary 'prefix'
qapi/block-core: Drop temporary 'prefix'
qapi/common: Drop temporary 'prefix'
qapi/crypto: Drop temporary 'prefix'
qapi/ebpf: Drop temporary 'prefix'
qapi/machine: Drop temporary 'prefix'
qapi/ui: Drop temporary 'prefix'
qapi/machine: Rename CpuS390* to S390Cpu*, and drop 'prefix'
qapi/crypto: Drop unwanted 'prefix'
qapi/crypto: Rename QCryptoHashAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoCipherAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoIVGenAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoAkCipherAlgorithm to *Algo, and drop prefix
qapi/crypto: Rename QCryptoRSAPaddingAlgorithm to *Algo, and drop
prefix
qapi/crypto: Rename QCryptoAFAlg to QCryptoAFAlgo
qapi/cryptodev: Drop unwanted 'prefix'
qapi/cryptodev: Rename QCryptodevBackendAlgType to *Algo, and drop
prefix
qapi/vfio: Rename VfioMigrationState to Qapi*, and drop prefix
qapi/block-core.json | 4 +-
qapi/crypto.json | 56 ++++------
qapi/cryptodev.json | 7 +-
qapi/machine-common.json | 5 +-
qapi/machine-target.json | 11 +-
qapi/machine.json | 9 +-
qapi/migration.json | 1 +
qapi/pragma.json | 6 +-
qapi/ui.json | 1 +
qapi/vfio.json | 9 +-
crypto/afalgpriv.h | 14 +--
crypto/akcipherpriv.h | 2 +-
crypto/blockpriv.h | 6 +-
crypto/cipherpriv.h | 2 +-
crypto/hashpriv.h | 2 +-
crypto/hmacpriv.h | 4 +-
crypto/ivgenpriv.h | 6 +-
include/crypto/afsplit.h | 8 +-
include/crypto/block.h | 2 +-
include/crypto/cipher.h | 18 ++--
include/crypto/hash.h | 18 ++--
include/crypto/hmac.h | 6 +-
include/crypto/ivgen.h | 30 +++---
include/crypto/pbkdf.h | 14 +--
include/hw/qdev-properties-system.h | 2 +-
include/hw/s390x/cpu-topology.h | 2 +-
include/sysemu/cryptodev.h | 2 +-
target/s390x/cpu.h | 2 +-
backends/cryptodev-builtin.c | 52 ++++-----
backends/cryptodev-lkcf.c | 36 +++----
backends/cryptodev-vhost-user.c | 6 +-
backends/cryptodev.c | 12 +--
block.c | 6 +-
block/crypto.c | 10 +-
block/parallels-ext.c | 2 +-
block/qcow.c | 2 +-
block/qcow2.c | 10 +-
block/quorum.c | 4 +-
block/rbd.c | 4 +-
crypto/afalg.c | 8 +-
crypto/afsplit.c | 6 +-
crypto/akcipher.c | 2 +-
crypto/block-luks.c | 128 +++++++++++------------
crypto/block-qcow.c | 6 +-
crypto/block.c | 8 +-
crypto/cipher-afalg.c | 36 +++----
crypto/cipher.c | 72 ++++++-------
crypto/hash-afalg.c | 40 +++----
crypto/hash-gcrypt.c | 20 ++--
crypto/hash-glib.c | 20 ++--
crypto/hash-gnutls.c | 20 ++--
crypto/hash-nettle.c | 18 ++--
crypto/hash.c | 30 +++---
crypto/hmac-gcrypt.c | 22 ++--
crypto/hmac-glib.c | 22 ++--
crypto/hmac-gnutls.c | 22 ++--
crypto/hmac-nettle.c | 22 ++--
crypto/hmac.c | 2 +-
crypto/ivgen.c | 18 ++--
crypto/pbkdf-gcrypt.c | 36 +++----
crypto/pbkdf-gnutls.c | 36 +++----
crypto/pbkdf-nettle.c | 32 +++---
crypto/pbkdf-stub.c | 4 +-
crypto/pbkdf.c | 2 +-
crypto/secret_common.c | 2 +-
ebpf/ebpf_rss.c | 2 +-
hw/core/numa.c | 4 +-
hw/core/qdev-properties-system.c | 6 +-
hw/misc/aspeed_hace.c | 16 +--
hw/pci-bridge/cxl_upstream.c | 4 +-
hw/s390x/cpu-topology.c | 6 +-
hw/vfio/migration.c | 2 +-
hw/vfio/pci.c | 10 +-
hw/virtio/virtio-crypto.c | 24 ++---
io/channel-websock.c | 2 +-
system/vl.c | 2 +-
target/i386/sev.c | 6 +-
tests/bench/benchmark-crypto-akcipher.c | 28 ++---
tests/bench/benchmark-crypto-cipher.c | 22 ++--
tests/bench/benchmark-crypto-hash.c | 10 +-
tests/bench/benchmark-crypto-hmac.c | 6 +-
tests/unit/test-crypto-afsplit.c | 10 +-
tests/unit/test-crypto-akcipher.c | 54 +++++-----
tests/unit/test-crypto-block.c | 58 +++++-----
tests/unit/test-crypto-cipher.c | 66 ++++++------
tests/unit/test-crypto-hash.c | 42 ++++----
tests/unit/test-crypto-hmac.c | 16 +--
tests/unit/test-crypto-ivgen.c | 38 +++----
tests/unit/test-crypto-pbkdf.c | 44 ++++----
tests/unit/test-qobject-input-visitor.c | 4 +-
tests/unit/test-qobject-output-visitor.c | 4 +-
ui/dbus.c | 8 +-
ui/egl-context.c | 2 +-
ui/egl-headless.c | 2 +-
ui/egl-helpers.c | 12 +--
ui/gtk.c | 4 +-
ui/sdl2-gl.c | 8 +-
ui/sdl2.c | 2 +-
ui/spice-core.c | 2 +-
ui/vnc.c | 6 +-
util/hbitmap.c | 2 +-
crypto/akcipher-gcrypt.c.inc | 44 ++++----
crypto/akcipher-nettle.c.inc | 56 +++++-----
crypto/cipher-builtin.c.inc | 18 ++--
crypto/cipher-gcrypt.c.inc | 56 +++++-----
crypto/cipher-gnutls.c.inc | 38 +++----
crypto/cipher-nettle.c.inc | 58 +++++-----
crypto/rsakey-builtin.c.inc | 4 +-
crypto/rsakey-nettle.c.inc | 4 +-
scripts/qapi/common.py | 42 ++++----
scripts/qapi/schema.py | 2 +-
tests/qapi-schema/alternate-array.out | 1 -
tests/qapi-schema/comments.out | 1 -
tests/qapi-schema/doc-good.out | 1 -
tests/qapi-schema/empty.out | 1 -
tests/qapi-schema/include-repetition.out | 1 -
tests/qapi-schema/include-simple.out | 1 -
tests/qapi-schema/indented-expr.out | 1 -
tests/qapi-schema/qapi-schema-test.out | 1 -
119 files changed, 937 insertions(+), 954 deletions(-)
--
2.46.0
next reply other threads:[~2024-09-04 11:30 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 11:18 Markus Armbruster [this message]
2024-09-04 11:18 ` [PATCH v2 01/19] qapi: Smarter camel_to_upper() to reduce need for 'prefix' Markus Armbruster
2024-09-04 12:18 ` Daniel P. Berrangé
2024-09-05 5:59 ` Markus Armbruster
2024-09-05 15:52 ` Daniel P. Berrangé
2024-09-05 16:07 ` Peter Xu
2024-09-04 11:18 ` [PATCH v2 02/19] tests/qapi-schema: Drop temporary 'prefix' Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 03/19] qapi/block-core: " Markus Armbruster
2024-09-30 13:23 ` Vladimir Sementsov-Ogievskiy
2024-09-30 13:28 ` Vladimir Sementsov-Ogievskiy
2024-09-04 11:18 ` [PATCH v2 04/19] qapi/common: " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 05/19] qapi/crypto: " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 06/19] qapi/ebpf: " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 07/19] qapi/machine: " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 08/19] qapi/ui: " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 09/19] qapi/machine: Rename CpuS390* to S390Cpu*, and drop 'prefix' Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 10/19] qapi/crypto: Drop unwanted 'prefix' Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 11/19] qapi/crypto: Rename QCryptoHashAlgorithm to *Algo, and drop prefix Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 12/19] qapi/crypto: Rename QCryptoCipherAlgorithm " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 13/19] qapi/crypto: Rename QCryptoIVGenAlgorithm " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 14/19] qapi/crypto: Rename QCryptoAkCipherAlgorithm " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 15/19] qapi/crypto: Rename QCryptoRSAPaddingAlgorithm " Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 16/19] qapi/crypto: Rename QCryptoAFAlg to QCryptoAFAlgo Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 17/19] qapi/cryptodev: Drop unwanted 'prefix' Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 18/19] qapi/cryptodev: Rename QCryptodevBackendAlgType to *Algo, and drop prefix Markus Armbruster
2024-09-04 11:18 ` [PATCH v2 19/19] qapi/vfio: Rename VfioMigrationState to Qapi*, " Markus Armbruster
2024-09-04 11:59 ` Cédric Le Goater
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=20240904111836.3273842-1-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=andrew@codeconstruct.com.au \
--cc=andrew@daynix.com \
--cc=arei.gonglei@huawei.com \
--cc=avihaih@nvidia.com \
--cc=berrange@redhat.com \
--cc=berto@igalia.com \
--cc=borntraeger@linux.ibm.com \
--cc=clg@kaod.org \
--cc=david@redhat.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=farman@linux.ibm.com \
--cc=farosas@suse.de \
--cc=hreitz@redhat.com \
--cc=idryomov@gmail.com \
--cc=iii@linux.ibm.com \
--cc=jamin_lin@aspeedtech.com \
--cc=jasowang@redhat.com \
--cc=joel@jms.id.au \
--cc=jsnow@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=leetroy@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=michael.roth@amd.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=nsg@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=pizhenwei@bytedance.com \
--cc=pl@dlhnet.de \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
--cc=steven_lee@aspeedtech.com \
--cc=thuth@redhat.com \
--cc=vsementsov@yandex-team.ru \
--cc=wangyanan55@huawei.com \
--cc=yuri.benditovich@daynix.com \
--cc=zhao1.liu@intel.com \
/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).