From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: QEMU <qemu-devel@nongnu.org>, Michael Roth <mdroth@linux.vnet.ibm.com>
Subject: Re: [Qemu-devel] [PATCH 02/16] qapi: Drop superfluous qapi_enum_parse() parameter max
Date: Thu, 24 Aug 2017 12:45:58 +0200 [thread overview]
Message-ID: <CAJ+F1CLX4y7opFp2GiO2QtA8vQv7214L0cSPB=4qRz8ZkLptPQ@mail.gmail.com> (raw)
In-Reply-To: <1503564371-26090-3-git-send-email-armbru@redhat.com>
On Thu, Aug 24, 2017 at 10:45 AM, Markus Armbruster <armbru@redhat.com> wrote:
> The lookup tables have a sentinel, no need to make callers pass their
> size.
>
> Fun: the header has it in the wrong position. Good riddance.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> block.c | 1 -
> block/file-posix.c | 7 +++----
> block/file-win32.c | 2 +-
> block/gluster.c | 6 ++----
> block/parallels.c | 3 ++-
> block/qcow2.c | 6 ++----
> blockdev.c | 1 -
> hmp.c | 2 +-
> include/qapi/util.h | 2 +-
> migration/global_state.c | 3 +--
> qapi/qapi-util.c | 4 ++--
> qemu-img.c | 3 +--
> qemu-nbd.c | 1 -
> tests/test-qapi-util.c | 15 +++++----------
> 14 files changed, 21 insertions(+), 35 deletions(-)
>
> diff --git a/block.c b/block.c
> index 3615a68..dd0efa2 100644
> --- a/block.c
> +++ b/block.c
> @@ -1335,7 +1335,6 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
> BlockdevDetectZeroesOptions value =
> qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,
> detect_zeroes,
> - BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,
> BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
> &local_err);
> if (local_err) {
> diff --git a/block/file-posix.c b/block/file-posix.c
> index cb3bfce..97e8a92 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -439,7 +439,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
> ? BLOCKDEV_AIO_OPTIONS_NATIVE
> : BLOCKDEV_AIO_OPTIONS_THREADS;
> aio = qapi_enum_parse(BlockdevAioOptions_lookup, qemu_opt_get(opts, "aio"),
> - BLOCKDEV_AIO_OPTIONS__MAX, aio_default, &local_err);
> + aio_default, &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> ret = -EINVAL;
> @@ -448,7 +448,7 @@ 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"),
> - ON_OFF_AUTO__MAX, ON_OFF_AUTO_AUTO, &local_err);
> + ON_OFF_AUTO_AUTO, &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> ret = -EINVAL;
> @@ -1975,8 +1975,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,
> - &local_err);
> + PREALLOC_MODE_OFF, &local_err);
> g_free(buf);
> if (local_err) {
> error_propagate(errp, local_err);
> diff --git a/block/file-win32.c b/block/file-win32.c
> index 4706335..978d805 100644
> --- a/block/file-win32.c
> +++ b/block/file-win32.c
> @@ -304,7 +304,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"),
> - BLOCKDEV_AIO_OPTIONS__MAX, aio_default, errp);
> + aio_default, errp);
>
> switch (aio) {
> case BLOCKDEV_AIO_OPTIONS_NATIVE:
> diff --git a/block/gluster.c b/block/gluster.c
> index 3064a45..8367e80 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -544,8 +544,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
> if (!strcmp(ptr, "tcp")) {
> ptr = "inet"; /* accept legacy "tcp" */
> }
> - type = qapi_enum_parse(SocketAddressType_lookup, ptr,
> - SOCKET_ADDRESS_TYPE__MAX, -1, NULL);
> + type = qapi_enum_parse(SocketAddressType_lookup, ptr, -1, NULL);
> if (type != SOCKET_ADDRESS_TYPE_INET
> && type != SOCKET_ADDRESS_TYPE_UNIX) {
> error_setg(&local_err,
> @@ -1002,8 +1001,7 @@ static int qemu_gluster_create(const char *filename,
> BDRV_SECTOR_SIZE);
>
> tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
> - prealloc = qapi_enum_parse(PreallocMode_lookup, tmp,
> - PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,
> + prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, PREALLOC_MODE_OFF,
> &local_err);
> g_free(tmp);
> if (local_err) {
> diff --git a/block/parallels.c b/block/parallels.c
> index e1e06d2..eb92366 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -697,7 +697,8 @@ 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_FALLOCATE,
> + &local_err);
> g_free(buf);
> if (local_err != NULL) {
> goto fail_options;
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 40ba26c..7aaf248 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -2933,8 +2933,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp)
> }
> buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
> prealloc = qapi_enum_parse(PreallocMode_lookup, buf,
> - PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,
> - &local_err);
> + PREALLOC_MODE_OFF, &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> ret = -EINVAL;
> @@ -3624,8 +3623,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,
>
> optstr = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
> prealloc = qapi_enum_parse(PreallocMode_lookup, optstr,
> - PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,
> - &local_err);
> + PREALLOC_MODE_OFF, &local_err);
> g_free(optstr);
> if (local_err) {
> goto err;
> diff --git a/blockdev.c b/blockdev.c
> index 02cd69b..722a61e 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -440,7 +440,6 @@ static void extract_common_blockdev_options(QemuOpts *opts, int *bdrv_flags,
> *detect_zeroes =
> qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,
> qemu_opt_get(opts, "detect-zeroes"),
> - BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,
> BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
> &local_error);
> if (local_error) {
> diff --git a/hmp.c b/hmp.c
> index fd80dce..03c1a78 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1742,7 +1742,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
> if (read_only) {
> read_only_mode =
> qapi_enum_parse(BlockdevChangeReadOnlyMode_lookup,
> - read_only, BLOCKDEV_CHANGE_READ_ONLY_MODE__MAX,
> + read_only,
> BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err);
> if (err) {
> hmp_handle_error(mon, &err);
> diff --git a/include/qapi/util.h b/include/qapi/util.h
> index 7436ed8..4eb8a3f 100644
> --- a/include/qapi/util.h
> +++ b/include/qapi/util.h
> @@ -12,7 +12,7 @@
> #define QAPI_UTIL_H
>
> int qapi_enum_parse(const char * const lookup[], const char *buf,
> - int max, int def, Error **errp);
> + int def, Error **errp);
>
> int parse_qapi_name(const char *name, bool complete);
>
> diff --git a/migration/global_state.c b/migration/global_state.c
> index dcbbcb2..88c55f8 100644
> --- a/migration/global_state.c
> +++ b/migration/global_state.c
> @@ -89,8 +89,7 @@ static int global_state_post_load(void *opaque, int version_id)
> s->received = true;
> trace_migrate_global_state_post_load(runstate);
>
> - r = qapi_enum_parse(RunState_lookup, runstate, RUN_STATE__MAX,
> - -1, &local_err);
> + r = qapi_enum_parse(RunState_lookup, runstate, -1, &local_err);
>
> if (r == -1) {
> if (local_err) {
> diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
> index 46eda7d..ee7594f 100644
> --- a/qapi/qapi-util.c
> +++ b/qapi/qapi-util.c
> @@ -16,7 +16,7 @@
> #include "qapi/util.h"
>
> int qapi_enum_parse(const char * const lookup[], const char *buf,
> - int max, int def, Error **errp)
> + int def, Error **errp)
> {
> int i;
>
> @@ -24,7 +24,7 @@ int qapi_enum_parse(const char * const lookup[], const char *buf,
> return def;
> }
>
> - for (i = 0; i < max; i++) {
> + for (i = 0; lookup[i]; i++) {
> if (!strcmp(buf, lookup[i])) {
> return i;
> }
> diff --git a/qemu-img.c b/qemu-img.c
> index 56ef49e..611ab7d 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -3491,8 +3491,7 @@ static int img_resize(int argc, char **argv)
> break;
> case OPTION_PREALLOCATION:
> prealloc = qapi_enum_parse(PreallocMode_lookup, optarg,
> - PREALLOC_MODE__MAX, PREALLOC_MODE__MAX,
> - NULL);
> + PREALLOC_MODE__MAX, NULL);
> if (prealloc == PREALLOC_MODE__MAX) {
> error_report("Invalid preallocation mode '%s'", optarg);
> return 1;
> diff --git a/qemu-nbd.c b/qemu-nbd.c
> index 27164b8..96e10d6 100644
> --- a/qemu-nbd.c
> +++ b/qemu-nbd.c
> @@ -641,7 +641,6 @@ int main(int argc, char **argv)
> detect_zeroes =
> qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,
> optarg,
> - BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,
> BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
> &local_err);
> if (local_err) {
> diff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c
> index e869757..d72ee8c 100644
> --- a/tests/test-qapi-util.c
> +++ b/tests/test-qapi-util.c
> @@ -20,25 +20,20 @@ static void test_qapi_enum_parse(void)
> Error *err = NULL;
> int ret;
>
> - ret = qapi_enum_parse(QType_lookup, NULL, QTYPE__MAX, QTYPE_NONE,
> - &error_abort);
> + ret = qapi_enum_parse(QType_lookup, NULL, QTYPE_NONE, &error_abort);
> g_assert_cmpint(ret, ==, QTYPE_NONE);
>
> - ret = qapi_enum_parse(QType_lookup, "junk", QTYPE__MAX, -1,
> - NULL);
> + ret = qapi_enum_parse(QType_lookup, "junk", -1, NULL);
> g_assert_cmpint(ret, ==, -1);
>
> - ret = qapi_enum_parse(QType_lookup, "junk", QTYPE__MAX, -1,
> - &err);
> + ret = qapi_enum_parse(QType_lookup, "junk", -1, &err);
> error_free_or_abort(&err);
>
> - ret = qapi_enum_parse(QType_lookup, "none", QTYPE__MAX, -1,
> - &error_abort);
> + ret = qapi_enum_parse(QType_lookup, "none", -1, &error_abort);
> g_assert_cmpint(ret, ==, QTYPE_NONE);
>
> ret = qapi_enum_parse(QType_lookup, QType_lookup[QTYPE__MAX - 1],
> - QTYPE__MAX, QTYPE__MAX - 1,
> - &error_abort);
> + QTYPE__MAX - 1, &error_abort);
> g_assert_cmpint(ret, ==, QTYPE__MAX - 1);
> }
>
> --
> 2.7.5
>
>
--
Marc-André Lureau
next prev parent reply other threads:[~2017-08-24 10:46 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 8:45 [Qemu-devel] [PATCH 00/16] qapi: Rework mapping of enum value to string Markus Armbruster
2017-08-24 8:45 ` [Qemu-devel] [PATCH 01/16] qapi: Update qapi-code-gen.txt examples to match current code Markus Armbruster
2017-08-24 10:43 ` Marc-André Lureau
2017-08-24 16:32 ` Eric Blake
2017-08-24 18:29 ` Markus Armbruster
2017-08-24 8:45 ` [Qemu-devel] [PATCH 02/16] qapi: Drop superfluous qapi_enum_parse() parameter max Markus Armbruster
2017-08-24 10:45 ` Marc-André Lureau [this message]
2017-08-24 16:38 ` Eric Blake
2017-08-24 18:35 ` Markus Armbruster
2017-08-24 18:56 ` Eric Blake
2017-08-24 19:24 ` Markus Armbruster
2017-08-24 8:45 ` [Qemu-devel] [PATCH 03/16] tpm: Clean up driver registration & lookup Markus Armbruster
2017-08-24 8:45 ` [Qemu-devel] [PATCH 04/16] tpm: Clean up model " Markus Armbruster
2017-08-24 10:50 ` Marc-André Lureau
2017-08-24 18:35 ` Markus Armbruster
2017-08-24 8:46 ` [Qemu-devel] [PATCH 05/16] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability() Markus Armbruster
2017-08-24 8:46 ` [Qemu-devel] [PATCH 06/16] hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter() Markus Armbruster
2017-08-24 8:46 ` [Qemu-devel] [PATCH 07/16] block: Use qemu_enum_parse() in blkdebug_debug_breakpoint() Markus Armbruster
2017-08-24 8:46 ` [Qemu-devel] [PATCH 08/16] quorum: Use qapi_enum_parse() in quorum_open() Markus Armbruster
2017-08-24 8:46 ` [Qemu-devel] [PATCH 09/16] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup() Markus Armbruster
2017-08-24 10:53 ` Marc-André Lureau
2017-08-29 11:10 ` Daniel P. Berrange
2017-08-24 8:46 ` [Qemu-devel] [PATCH 10/16] qapi: Use qapi_enum_parse() in input_type_enum() Markus Armbruster
2017-08-24 11:30 ` Marc-André Lureau
2017-08-24 8:46 ` [Qemu-devel] [PATCH 11/16] qapi: Avoid unnecessary use of enum lookup table's sentinel Markus Armbruster
2017-08-24 11:34 ` Marc-André Lureau
2017-08-24 8:46 ` [Qemu-devel] [PATCH 12/16] qapi: Generate FOO_str() macro for QAPI enum FOO Markus Armbruster
2017-08-30 13:42 ` Marc-André Lureau
2017-08-24 8:46 ` [Qemu-devel] [PATCH 13/16] qapi: Mechanically convert FOO_lookup[...] to FOO_str(...) Markus Armbruster
2017-08-24 11:52 ` Marc-André Lureau
2017-08-24 8:46 ` [Qemu-devel] [PATCH 14/16] qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup() Markus Armbruster
2017-08-24 12:02 ` Marc-André Lureau
2017-08-24 8:46 ` [Qemu-devel] [PATCH 15/16] qapi: Change data type of the FOO_lookup generated for enum FOO Markus Armbruster
2017-08-24 9:55 ` Markus Armbruster
2017-08-24 8:46 ` [Qemu-devel] [PATCH 16/16] qapi: drop the sentinel in enum array Markus Armbruster
2017-08-24 9:22 ` [Qemu-devel] [PATCH 00/16] qapi: Rework mapping of enum value to string no-reply
2017-09-01 12:43 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ+F1CLX4y7opFp2GiO2QtA8vQv7214L0cSPB=4qRz8ZkLptPQ@mail.gmail.com' \
--to=marcandre.lureau@gmail.com \
--cc=armbru@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.