| Message ID | 2d9e19b85f0d65beb7da9f3201e26257345fd182.1402544518.git.hutao@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 12.06.2014 05:54, Hu Tao wrote: > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > Suggested-by: Markus Armbruster <armbru@redhat.com> > --- > blockdev.c | 22 ++-------------------- > include/qapi/util.h | 17 +++++++++++++++++ > qapi/Makefile.objs | 2 +- > qapi/qapi-util.c | 32 ++++++++++++++++++++++++++++++++ > 4 files changed, 52 insertions(+), 21 deletions(-) > create mode 100644 include/qapi/util.h > create mode 100644 qapi/qapi-util.c > > diff --git a/blockdev.c b/blockdev.c > index 4cbcc56..9adfdbb 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -39,6 +39,7 @@ > #include "qapi/qmp/types.h" > #include "qapi-visit.h" > #include "qapi/qmp-output-visitor.h" > +#include "qapi/util.h" > #include "sysemu/sysemu.h" > #include "block/block_int.h" > #include "qmp-commands.h" > @@ -287,25 +288,6 @@ static int parse_block_error_action(const char *buf, bool is_read, Error **errp) > } > } > > -static inline int parse_enum_option(const char *lookup[], const char *buf, > - int max, int def, Error **errp) > -{ > - int i; > - > - if (!buf) { > - return def; > - } > - > - for (i = 0; i < max; i++) { > - if (!strcmp(buf, lookup[i])) { > - return i; > - } > - } > - > - error_setg(errp, "invalid parameter value: %s", buf); > - return def; > -} > - > static bool check_throttle_config(ThrottleConfig *cfg, Error **errp) > { > if (throttle_conflicting(cfg)) { > @@ -472,7 +454,7 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts, > } > > detect_zeroes = > - parse_enum_option(BlockdevDetectZeroesOptions_lookup, > + qapi_enum_parse(BlockdevDetectZeroesOptions_lookup, > qemu_opt_get(opts, "detect-zeroes"), > BLOCKDEV_DETECT_ZEROES_OPTIONS_MAX, > BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, Please adapt the indentation of the other parameters. Other than that: Reviewed-by: Max Reitz <mreitz@redhat.com>
On Sat, Jun 14, 2014 at 09:07:19PM +0200, Max Reitz wrote: > On 12.06.2014 05:54, Hu Tao wrote: > >Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > >Suggested-by: Markus Armbruster <armbru@redhat.com> > >--- > > blockdev.c | 22 ++-------------------- > > include/qapi/util.h | 17 +++++++++++++++++ > > qapi/Makefile.objs | 2 +- > > qapi/qapi-util.c | 32 ++++++++++++++++++++++++++++++++ > > 4 files changed, 52 insertions(+), 21 deletions(-) > > create mode 100644 include/qapi/util.h > > create mode 100644 qapi/qapi-util.c > > > >diff --git a/blockdev.c b/blockdev.c > >index 4cbcc56..9adfdbb 100644 > >--- a/blockdev.c > >+++ b/blockdev.c > >@@ -39,6 +39,7 @@ > > #include "qapi/qmp/types.h" > > #include "qapi-visit.h" > > #include "qapi/qmp-output-visitor.h" > >+#include "qapi/util.h" > > #include "sysemu/sysemu.h" > > #include "block/block_int.h" > > #include "qmp-commands.h" > >@@ -287,25 +288,6 @@ static int parse_block_error_action(const char *buf, bool is_read, Error **errp) > > } > > } > >-static inline int parse_enum_option(const char *lookup[], const char *buf, > >- int max, int def, Error **errp) > >-{ > >- int i; > >- > >- if (!buf) { > >- return def; > >- } > >- > >- for (i = 0; i < max; i++) { > >- if (!strcmp(buf, lookup[i])) { > >- return i; > >- } > >- } > >- > >- error_setg(errp, "invalid parameter value: %s", buf); > >- return def; > >-} > >- > > static bool check_throttle_config(ThrottleConfig *cfg, Error **errp) > > { > > if (throttle_conflicting(cfg)) { > >@@ -472,7 +454,7 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts, > > } > > detect_zeroes = > >- parse_enum_option(BlockdevDetectZeroesOptions_lookup, > >+ qapi_enum_parse(BlockdevDetectZeroesOptions_lookup, > > qemu_opt_get(opts, "detect-zeroes"), > > BLOCKDEV_DETECT_ZEROES_OPTIONS_MAX, > > BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, > > Please adapt the indentation of the other parameters. Sure. > > Other than that: > > Reviewed-by: Max Reitz <mreitz@redhat.com>
diff --git a/blockdev.c b/blockdev.c index 4cbcc56..9adfdbb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -39,6 +39,7 @@ #include "qapi/qmp/types.h" #include "qapi-visit.h" #include "qapi/qmp-output-visitor.h" +#include "qapi/util.h" #include "sysemu/sysemu.h" #include "block/block_int.h" #include "qmp-commands.h" @@ -287,25 +288,6 @@ static int parse_block_error_action(const char *buf, bool is_read, Error **errp) } } -static inline int parse_enum_option(const char *lookup[], const char *buf, - int max, int def, Error **errp) -{ - int i; - - if (!buf) { - return def; - } - - for (i = 0; i < max; i++) { - if (!strcmp(buf, lookup[i])) { - return i; - } - } - - error_setg(errp, "invalid parameter value: %s", buf); - return def; -} - static bool check_throttle_config(ThrottleConfig *cfg, Error **errp) { if (throttle_conflicting(cfg)) { @@ -472,7 +454,7 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts, } detect_zeroes = - parse_enum_option(BlockdevDetectZeroesOptions_lookup, + qapi_enum_parse(BlockdevDetectZeroesOptions_lookup, qemu_opt_get(opts, "detect-zeroes"), BLOCKDEV_DETECT_ZEROES_OPTIONS_MAX, BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF, diff --git a/include/qapi/util.h b/include/qapi/util.h new file mode 100644 index 0000000..de9238b --- /dev/null +++ b/include/qapi/util.h @@ -0,0 +1,17 @@ +/* + * QAPI util functions + * + * Copyright Fujitsu, Inc. 2014 + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#ifndef QAPI_UTIL_H +#define QAPI_UTIL_H + +int qapi_enum_parse(const char *lookup[], const char *buf, + int max, int def, Error **errp); + +#endif diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index 1f9c973..97c98c5 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -2,4 +2,4 @@ util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o util-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o util-obj-y += string-input-visitor.o string-output-visitor.o -util-obj-y += opts-visitor.o +util-obj-y += opts-visitor.o qapi-util.o diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c new file mode 100644 index 0000000..3e4e07c --- /dev/null +++ b/qapi/qapi-util.c @@ -0,0 +1,32 @@ +/* + * QAPI util functions + * + * Copyright Fujitsu, Inc. 2014 + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#include "qemu-common.h" +#include "qapi/error.h" +#include "qapi/util.h" + +int qapi_enum_parse(const char *lookup[], const char *buf, + int max, int def, Error **errp) +{ + int i; + + if (!buf) { + return def; + } + + for (i = 0; i < max; i++) { + if (!strcmp(buf, lookup[i])) { + return i; + } + } + + error_setg(errp, "invalid parameter value: %s", buf); + return def; +}
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> Suggested-by: Markus Armbruster <armbru@redhat.com> --- blockdev.c | 22 ++-------------------- include/qapi/util.h | 17 +++++++++++++++++ qapi/Makefile.objs | 2 +- qapi/qapi-util.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 include/qapi/util.h create mode 100644 qapi/qapi-util.c