Commit f7abe0ec authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qapi: Change data type of the FOO_lookup generated for enum FOO 



Currently, a FOO_lookup is an array of strings terminated by a NULL
sentinel.

A future patch will generate enums with "holes".  NULL-termination
will cease to work then.

To prepare for that, store the length in the FOO_lookup by wrapping it
in a struct and adding a member for the length.

The sentinel will be dropped next.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170822132255.23945-13-marcandre.lureau@redhat.com>
[Basically redone]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1503564371-26090-16-git-send-email-armbru@redhat.com>
[Rebased]
parent 788b305c

backends/hostmem.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ host_memory_backend_class_init(ObjectClass *oc, void *data) 
        host_memory_backend_set_host_nodes,

        NULL, NULL, &error_abort);

    object_class_property_add_enum(oc, "policy", "HostMemPolicy",

        HostMemPolicy_lookup,

        &HostMemPolicy_lookup,

        host_memory_backend_get_policy,

        host_memory_backend_set_policy, &error_abort);

    object_class_property_add_str(oc, "id", get_id, set_id, &error_abort);

block.c

+1 −1
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file, 
    detect_zeroes = qemu_opt_get(opts, "detect-zeroes");

    if (detect_zeroes) {

        BlockdevDetectZeroesOptions value =

            qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,

            qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup,

                            detect_zeroes,

                            BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,

                            &local_err);

block/blkdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp) 
        error_setg(errp, "Missing event name for rule");

        return -1;

    }

    event = qapi_enum_parse(BlkdebugEvent_lookup, event_name, -1, errp);

    event = qapi_enum_parse(&BlkdebugEvent_lookup, event_name, -1, errp);

    if (event < 0) {

        return -1;

    }
@@ -732,7 +732,7 @@ static int blkdebug_debug_breakpoint(BlockDriverState *bs, const char *event, 
    struct BlkdebugRule *rule;

    int blkdebug_event;



    blkdebug_event = qapi_enum_parse(BlkdebugEvent_lookup, event, -1, NULL);

    blkdebug_event = qapi_enum_parse(&BlkdebugEvent_lookup, event, -1, NULL);

    if (blkdebug_event < 0) {

        return -ENOENT;

    }

block/file-posix.c

+5 −3
Original line number Diff line number Diff line
@@ -437,7 +437,8 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, 
    aio_default = (bdrv_flags & BDRV_O_NATIVE_AIO)

                  ? BLOCKDEV_AIO_OPTIONS_NATIVE

                  : BLOCKDEV_AIO_OPTIONS_THREADS;

    aio = qapi_enum_parse(BlockdevAioOptions_lookup, qemu_opt_get(opts, "aio"),

    aio = qapi_enum_parse(&BlockdevAioOptions_lookup,

                          qemu_opt_get(opts, "aio"),

                          aio_default, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);
@@ -446,7 +447,8 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, 
    }

    s->use_linux_aio = (aio == BLOCKDEV_AIO_OPTIONS_NATIVE);



    locking = qapi_enum_parse(OnOffAuto_lookup, qemu_opt_get(opts, "locking"),

    locking = qapi_enum_parse(&OnOffAuto_lookup,

                              qemu_opt_get(opts, "locking"),

                              ON_OFF_AUTO_AUTO, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);
@@ -1973,7 +1975,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
                          BDRV_SECTOR_SIZE);

    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 = qapi_enum_parse(&PreallocMode_lookup, buf,

                               PREALLOC_MODE_OFF, &local_err);

    g_free(buf);

    if (local_err) {

block/file-win32.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static bool get_aio_option(QemuOpts *opts, int flags, Error **errp) 


    aio_default = (flags & BDRV_O_NATIVE_AIO) ? BLOCKDEV_AIO_OPTIONS_NATIVE

                                              : BLOCKDEV_AIO_OPTIONS_THREADS;

    aio = qapi_enum_parse(BlockdevAioOptions_lookup, qemu_opt_get(opts, "aio"),

    aio = qapi_enum_parse(&BlockdevAioOptions_lookup, qemu_opt_get(opts, "aio"),

                          aio_default, errp);



    switch (aio) {