Commit 7fb1cf16 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

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: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 59a92fee

block/blkdebug.c

+5 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ typedef struct BDRVBlkdebugState { 
    int state;

    int new_state;



    QLIST_HEAD(, BlkdebugRule) rules[BLKDBG_MAX];

    QLIST_HEAD(, BlkdebugRule) rules[BLKDBG__MAX];

    QSIMPLEQ_HEAD(, BlkdebugRule) active_rules;

    QLIST_HEAD(, BlkdebugSuspendedReq) suspended_reqs;

} BDRVBlkdebugState;
@@ -147,7 +147,7 @@ static int get_event_by_name(const char *name, BlkdebugEvent *event) 
{

    int i;



    for (i = 0; i < BLKDBG_MAX; i++) {

    for (i = 0; i < BLKDBG__MAX; i++) {

        if (!strcmp(BlkdebugEvent_lookup[i], name)) {

            *event = i;

            return 0;
@@ -507,7 +507,7 @@ static void blkdebug_close(BlockDriverState *bs) 
    BlkdebugRule *rule, *next;

    int i;



    for (i = 0; i < BLKDBG_MAX; i++) {

    for (i = 0; i < BLKDBG__MAX; i++) {

        QLIST_FOREACH_SAFE(rule, &s->rules[i], next, next) {

            remove_rule(rule);

        }
@@ -576,7 +576,7 @@ static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) 
    struct BlkdebugRule *rule, *next;

    bool injected;



    assert((int)event >= 0 && event < BLKDBG_MAX);

    assert((int)event >= 0 && event < BLKDBG__MAX);



    injected = false;

    s->new_state = s->state;
@@ -633,7 +633,7 @@ static int blkdebug_debug_remove_breakpoint(BlockDriverState *bs, 
    BlkdebugRule *rule, *next;

    int i, ret = -ENOENT;



    for (i = 0; i < BLKDBG_MAX; i++) {

    for (i = 0; i < BLKDBG__MAX; i++) {

        QLIST_FOREACH_SAFE(rule, &s->rules[i], next, next) {

            if (rule->action == ACTION_SUSPEND &&

                !strcmp(rule->options.suspend.tag, tag)) {

block/parallels.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ typedef struct ParallelsHeader { 
typedef enum ParallelsPreallocMode {

    PRL_PREALLOC_MODE_FALLOCATE = 0,

    PRL_PREALLOC_MODE_TRUNCATE = 1,

    PRL_PREALLOC_MODE_MAX = 2,

    PRL_PREALLOC_MODE__MAX = 2,

} ParallelsPreallocMode;



static const char *prealloc_mode_lookup[] = {
@@ -660,7 +660,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 
    s->prealloc_size = MAX(s->tracks, s->prealloc_size >> BDRV_SECTOR_BITS);

    buf = qemu_opt_get_del(opts, PARALLELS_OPT_PREALLOC_MODE);

    s->prealloc_mode = qapi_enum_parse(prealloc_mode_lookup, buf,

            PRL_PREALLOC_MODE_MAX, PRL_PREALLOC_MODE_FALLOCATE, &local_err);

            PRL_PREALLOC_MODE__MAX, PRL_PREALLOC_MODE_FALLOCATE, &local_err);

    g_free(buf);

    if (local_err != NULL) {

        goto fail_options;

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -2269,7 +2269,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp) 
                                         DEFAULT_CLUSTER_SIZE);

    buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);

    prealloc = qapi_enum_parse(PreallocMode_lookup, buf,

                               PREALLOC_MODE_MAX, PREALLOC_MODE_OFF,

                               PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,

                               &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

block/quorum.c

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static int parse_read_pattern(const char *opt) 
        return QUORUM_READ_PATTERN_QUORUM;

    }



    for (i = 0; i < QUORUM_READ_PATTERN_MAX; i++) {

    for (i = 0; i < QUORUM_READ_PATTERN__MAX; i++) {

        if (!strcmp(opt, QuorumReadPattern_lookup[i])) {

            return i;

        }

block/raw-posix.c

+1 −1
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
    nocow = qemu_opt_get_bool(opts, BLOCK_OPT_NOCOW, false);

    buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);

    prealloc = qapi_enum_parse(PreallocMode_lookup, buf,

                               PREALLOC_MODE_MAX, PREALLOC_MODE_OFF,

                               PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,

                               &local_err);

    g_free(buf);

    if (local_err) {