mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-12-11 16:00:50 -07:00
7fb1cf1606
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
||
|---|---|---|
| .. | ||
| specs | ||
| aio_notify.promela | ||
| aio_notify_accept.promela | ||
| aio_notify_bug.promela | ||
| atomics.txt | ||
| bitmaps.md | ||
| blkdebug.txt | ||
| blkverify.txt | ||
| bootindex.txt | ||
| build-system.txt | ||
| ccid.txt | ||
| ich9-ehci-uhci.cfg | ||
| image-fuzzer.txt | ||
| live-block-ops.txt | ||
| memory-hotplug.txt | ||
| memory.txt | ||
| migration.txt | ||
| multi-thread-compression.txt | ||
| multiple-iothreads.txt | ||
| multiseat.txt | ||
| pci_expander_bridge.txt | ||
| q35-chipset.cfg | ||
| qapi-code-gen.txt | ||
| qcow2-cache.txt | ||
| qdev-device-use.txt | ||
| qemupciserial.inf | ||
| qmp-events.txt | ||
| qmp-intro.txt | ||
| qmp-spec.txt | ||
| rcu.txt | ||
| rdma.txt | ||
| replay.txt | ||
| spice-port-fqdn.txt | ||
| tracing.txt | ||
| usb-storage.txt | ||
| usb2.txt | ||
| virtio-balloon-stats.txt | ||
| virtio-migration.txt | ||
| vnc-ledstate-Pseudo-encoding.txt | ||
| win32-qemu-event.promela | ||
| writing-qmp-commands.txt | ||
| xbzrle.txt | ||
| xen-save-devices-state.txt | ||