From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvtIe-00018m-EF for qemu-devel@nongnu.org; Sat, 14 Jun 2014 15:07:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvtIZ-0008Eg-Q9 for qemu-devel@nongnu.org; Sat, 14 Jun 2014 15:07:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvtIZ-0008Ea-Ft for qemu-devel@nongnu.org; Sat, 14 Jun 2014 15:07:31 -0400 Message-ID: <539C9D67.4060603@redhat.com> Date: Sat, 14 Jun 2014 21:07:19 +0200 From: Max Reitz MIME-Version: 1.0 References: <2d9e19b85f0d65beb7da9f3201e26257345fd182.1402544518.git.hutao@cn.fujitsu.com> In-Reply-To: <2d9e19b85f0d65beb7da9f3201e26257345fd182.1402544518.git.hutao@cn.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v10 3/6] rename parse_enum_option to qapi_enum_parse and make it public List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hu Tao , qemu-devel@nongnu.org Cc: kwolf@redhat.com, Peter Lieven , Markus Armbruster , Stefan Hajnoczi , y-goto@jp.fujitsu.com On 12.06.2014 05:54, Hu Tao wrote: > Signed-off-by: Hu Tao > Suggested-by: Markus Armbruster > --- > 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