qapi: Don't let implicit enum MAX member collide
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>
Showing
- block/blkdebug.c 5 additions, 5 deletionsblock/blkdebug.c
- block/parallels.c 2 additions, 2 deletionsblock/parallels.c
- block/qcow2.c 1 addition, 1 deletionblock/qcow2.c
- block/quorum.c 1 addition, 1 deletionblock/quorum.c
- block/raw-posix.c 1 addition, 1 deletionblock/raw-posix.c
- blockdev.c 1 addition, 1 deletionblockdev.c
- docs/qapi-code-gen.txt 2 additions, 2 deletionsdocs/qapi-code-gen.txt
- hmp.c 7 additions, 7 deletionshmp.c
- hw/char/escc.c 1 addition, 1 deletionhw/char/escc.c
- hw/i386/pc_piix.c 1 addition, 1 deletionhw/i386/pc_piix.c
- hw/i386/pc_q35.c 1 addition, 1 deletionhw/i386/pc_q35.c
- hw/input/hid.c 1 addition, 1 deletionhw/input/hid.c
- hw/input/ps2.c 1 addition, 1 deletionhw/input/ps2.c
- hw/input/virtio-input-hid.c 4 additions, 4 deletionshw/input/virtio-input-hid.c
- include/migration/migration.h 2 additions, 2 deletionsinclude/migration/migration.h
- migration/migration.c 2 additions, 2 deletionsmigration/migration.c
- monitor.c 7 additions, 7 deletionsmonitor.c
- net/net.c 2 additions, 2 deletionsnet/net.c
- qemu-nbd.c 1 addition, 1 deletionqemu-nbd.c
- replay/replay-input.c 4 additions, 4 deletionsreplay/replay-input.c
Loading
Please register or sign in to comment