]> git.proxmox.com Git - mirror_qemu.git/commit - hmp.c
qapi: Don't let implicit enum MAX member collide
authorEric Blake <eblake@redhat.com>
Wed, 18 Nov 2015 08:52:57 +0000 (01:52 -0700)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 17 Dec 2015 07:21:28 +0000 (08:21 +0100)
commit7fb1cf1606c78c9d5b538f29176fd5a101726a9d
tree69733bce4ee4a3c1ecd04f5b9a5f65ef1c50e106
parent59a92feedc6927e0e1ff87fdaccfb4dd42ad4c84
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>
34 files changed:
block/blkdebug.c
block/parallels.c
block/qcow2.c
block/quorum.c
block/raw-posix.c
blockdev.c
docs/qapi-code-gen.txt
hmp.c
hw/char/escc.c
hw/i386/pc_piix.c
hw/i386/pc_q35.c
hw/input/hid.c
hw/input/ps2.c
hw/input/virtio-input-hid.c
include/migration/migration.h
migration/migration.c
monitor.c
net/net.c
qemu-nbd.c
replay/replay-input.c
scripts/qapi.py
tests/test-qmp-output-visitor.c
tests/test-string-output-visitor.c
tpm.c
ui/cocoa.m
ui/console.c
ui/input-keymap.c
ui/input-legacy.c
ui/input.c
ui/sdl.c
ui/sdl2.c
ui/spice-input.c
ui/vnc.c
vl.c