ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi: Drop superfluous qapi_enum_parse() parameter max 

The lookup tables have a sentinel, no need to make callers pass their
size.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1503564371-26090-3-git-send-email-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[Rebased, commit message corrected]
This commit is contained in:
Markus Armbruster 2017-08-24 10:45:57 +02:00
parent 64355088e0
commit 06c60b6c46
15 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block.c
View File

@ -1335,7 +1335,6 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
BlockdevDetectZeroesOptions value = BlockdevDetectZeroesOptions value =
qapi_enum_parse(BlockdevDetectZeroesOptions_lookup, qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,
detect_zeroes, detect_zeroes,
BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,
BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
&local_err); &local_err);
if (local_err) { if (local_err) {

7
block/file-posix.c
View File

@ -439,7 +439,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
? BLOCKDEV_AIO_OPTIONS_NATIVE ? BLOCKDEV_AIO_OPTIONS_NATIVE
: BLOCKDEV_AIO_OPTIONS_THREADS; : 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"),
BLOCKDEV_AIO_OPTIONS__MAX, aio_default, &local_err); aio_default, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
ret = -EINVAL; ret = -EINVAL;
@ -448,7 +448,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
s->use_linux_aio = (aio == BLOCKDEV_AIO_OPTIONS_NATIVE); 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__MAX, ON_OFF_AUTO_AUTO, &local_err); ON_OFF_AUTO_AUTO, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
ret = -EINVAL; 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); nocow = qemu_opt_get_bool(opts, BLOCK_OPT_NOCOW, false);
buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); 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__MAX, PREALLOC_MODE_OFF, PREALLOC_MODE_OFF, &local_err);
&local_err);
g_free(buf); g_free(buf);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);

2
block/file-win32.c
View File

@ -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 aio_default = (flags & BDRV_O_NATIVE_AIO) ? BLOCKDEV_AIO_OPTIONS_NATIVE
: BLOCKDEV_AIO_OPTIONS_THREADS; : 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"),
BLOCKDEV_AIO_OPTIONS__MAX, aio_default, errp); aio_default, errp);
switch (aio) { switch (aio) {
case BLOCKDEV_AIO_OPTIONS_NATIVE: case BLOCKDEV_AIO_OPTIONS_NATIVE:

6
block/gluster.c
View File

@ -544,8 +544,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
if (!strcmp(ptr, "tcp")) { if (!strcmp(ptr, "tcp")) {
ptr = "inet"; /* accept legacy "tcp" */ ptr = "inet"; /* accept legacy "tcp" */
} }
type = qapi_enum_parse(SocketAddressType_lookup, ptr, type = qapi_enum_parse(SocketAddressType_lookup, ptr, -1, NULL);
SOCKET_ADDRESS_TYPE__MAX, -1, NULL);
if (type != SOCKET_ADDRESS_TYPE_INET if (type != SOCKET_ADDRESS_TYPE_INET
&& type != SOCKET_ADDRESS_TYPE_UNIX) { && type != SOCKET_ADDRESS_TYPE_UNIX) {
error_setg(&local_err, error_setg(&local_err,
@ -1002,8 +1001,7 @@ static int qemu_gluster_create(const char *filename,
BDRV_SECTOR_SIZE); BDRV_SECTOR_SIZE);
tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, PREALLOC_MODE_OFF,
PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,
&local_err); &local_err);
g_free(tmp); g_free(tmp);
if (local_err) { if (local_err) {

3
block/parallels.c
View File

@ -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); s->prealloc_size = MAX(s->tracks, s->prealloc_size >> BDRV_SECTOR_BITS);
buf = qemu_opt_get_del(opts, PARALLELS_OPT_PREALLOC_MODE); buf = qemu_opt_get_del(opts, PARALLELS_OPT_PREALLOC_MODE);
s->prealloc_mode = qapi_enum_parse(prealloc_mode_lookup, buf, 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); g_free(buf);
if (local_err != NULL) { if (local_err != NULL) {
goto fail_options; goto fail_options;

6
block/qcow2.c
View File

@ -2917,8 +2917,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp)
} }
buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); 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__MAX, PREALLOC_MODE_OFF, PREALLOC_MODE_OFF, &local_err);
&local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
ret = -EINVAL; ret = -EINVAL;
@ -3608,8 +3607,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,
optstr = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); optstr = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
prealloc = qapi_enum_parse(PreallocMode_lookup, optstr, prealloc = qapi_enum_parse(PreallocMode_lookup, optstr,
PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, PREALLOC_MODE_OFF, &local_err);
&local_err);
g_free(optstr); g_free(optstr);
if (local_err) { if (local_err) {
goto err; goto err;

1
blockdev.c
View File

@ -440,7 +440,6 @@ static void extract_common_blockdev_options(QemuOpts *opts, int *bdrv_flags,
*detect_zeroes = *detect_zeroes =
qapi_enum_parse(BlockdevDetectZeroesOptions_lookup, qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,
qemu_opt_get(opts, "detect-zeroes"), qemu_opt_get(opts, "detect-zeroes"),
BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,
BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
&local_error); &local_error);
if (local_error) { if (local_error) {

2
hmp.c
View File

@ -1742,7 +1742,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
if (read_only) { if (read_only) {
read_only_mode = read_only_mode =
qapi_enum_parse(BlockdevChangeReadOnlyMode_lookup, qapi_enum_parse(BlockdevChangeReadOnlyMode_lookup,
read_only, BLOCKDEV_CHANGE_READ_ONLY_MODE__MAX, read_only,
BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err); BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err);
if (err) { if (err) {
hmp_handle_error(mon, &err); hmp_handle_error(mon, &err);

2
include/qapi/util.h
View File

@ -12,7 +12,7 @@
#define QAPI_UTIL_H #define QAPI_UTIL_H
int qapi_enum_parse(const char * const lookup[], const char *buf, 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); int parse_qapi_name(const char *name, bool complete);

3
migration/global_state.c
View File

@ -89,8 +89,7 @@ static int global_state_post_load(void *opaque, int version_id)
s->received = true; s->received = true;
trace_migrate_global_state_post_load(runstate); trace_migrate_global_state_post_load(runstate);
r = qapi_enum_parse(RunState_lookup, runstate, RUN_STATE__MAX, r = qapi_enum_parse(RunState_lookup, runstate, -1, &local_err);
-1, &local_err);
if (r == -1) { if (r == -1) {
if (local_err) { if (local_err) {

4
qapi/qapi-util.c
View File

@ -16,7 +16,7 @@
#include "qapi/util.h" #include "qapi/util.h"
int qapi_enum_parse(const char * const lookup[], const char *buf, int qapi_enum_parse(const char * const lookup[], const char *buf,
int max, int def, Error **errp) int def, Error **errp)
{ {
int i; int i;
@ -24,7 +24,7 @@ int qapi_enum_parse(const char * const lookup[], const char *buf,
return def; return def;
} }
for (i = 0; i < max; i++) { for (i = 0; lookup[i]; i++) {
if (!strcmp(buf, lookup[i])) { if (!strcmp(buf, lookup[i])) {
return i; return i;
} }

3
qemu-img.c
View File

@ -3491,8 +3491,7 @@ static int img_resize(int argc, char **argv)
break; break;
case OPTION_PREALLOCATION: case OPTION_PREALLOCATION:
prealloc = qapi_enum_parse(PreallocMode_lookup, optarg, prealloc = qapi_enum_parse(PreallocMode_lookup, optarg,
PREALLOC_MODE__MAX, PREALLOC_MODE__MAX, PREALLOC_MODE__MAX, NULL);
NULL);
if (prealloc == PREALLOC_MODE__MAX) { if (prealloc == PREALLOC_MODE__MAX) {
error_report("Invalid preallocation mode '%s'", optarg); error_report("Invalid preallocation mode '%s'", optarg);
return 1; return 1;

1
qemu-nbd.c
View File

@ -641,7 +641,6 @@ int main(int argc, char **argv)
detect_zeroes = detect_zeroes =
qapi_enum_parse(BlockdevDetectZeroesOptions_lookup, qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,
optarg, optarg,
BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,
BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
&local_err); &local_err);
if (local_err) { if (local_err) {

3
tests/qmp-test.c
View File

@ -182,8 +182,7 @@ static void test_query(const void *data)
} else { } else {
g_assert(error); g_assert(error);
g_assert_cmpint(qapi_enum_parse(QapiErrorClass_lookup, error_class, g_assert_cmpint(qapi_enum_parse(QapiErrorClass_lookup, error_class,
QAPI_ERROR_CLASS__MAX, -1, -1, &error_abort),
&error_abort),
==, expected_error_class); ==, expected_error_class);
} }
QDECREF(resp); QDECREF(resp);

15
tests/test-qapi-util.c
View File

@ -20,25 +20,20 @@ static void test_qapi_enum_parse(void)
Error *err = NULL; Error *err = NULL;
int ret; int ret;
ret = qapi_enum_parse(QType_lookup, NULL, QTYPE__MAX, QTYPE_NONE, ret = qapi_enum_parse(QType_lookup, NULL, QTYPE_NONE, &error_abort);
&error_abort);
g_assert_cmpint(ret, ==, QTYPE_NONE); g_assert_cmpint(ret, ==, QTYPE_NONE);
ret = qapi_enum_parse(QType_lookup, "junk", QTYPE__MAX, -1, ret = qapi_enum_parse(QType_lookup, "junk", -1, NULL);
NULL);
g_assert_cmpint(ret, ==, -1); g_assert_cmpint(ret, ==, -1);
ret = qapi_enum_parse(QType_lookup, "junk", QTYPE__MAX, -1, ret = qapi_enum_parse(QType_lookup, "junk", -1, &err);
&err);
error_free_or_abort(&err); error_free_or_abort(&err);
ret = qapi_enum_parse(QType_lookup, "none", QTYPE__MAX, -1, ret = qapi_enum_parse(QType_lookup, "none", -1, &error_abort);
&error_abort);
g_assert_cmpint(ret, ==, QTYPE_NONE); g_assert_cmpint(ret, ==, QTYPE_NONE);
ret = qapi_enum_parse(QType_lookup, QType_lookup[QTYPE__MAX - 1], ret = qapi_enum_parse(QType_lookup, QType_lookup[QTYPE__MAX - 1],
QTYPE__MAX, QTYPE__MAX - 1, QTYPE__MAX - 1, &error_abort);
&error_abort);
g_assert_cmpint(ret, ==, QTYPE__MAX - 1); g_assert_cmpint(ret, ==, QTYPE__MAX - 1);
} }