From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwjIH-00046m-03 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 22:38:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwjIC-0001WU-BB for qemu-devel@nongnu.org; Mon, 16 Jun 2014 22:38:40 -0400 Received: from [59.151.112.132] (port=38298 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwjIC-0001Sq-09 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 22:38:36 -0400 Date: Tue, 17 Jun 2014 10:36:38 +0800 From: Hu Tao Message-ID: <20140617023638.GE6179@G08FNSTD100614.fnst.cn.fujitsu.com> References: <2d9e19b85f0d65beb7da9f3201e26257345fd182.1402544518.git.hutao@cn.fujitsu.com> <539C9D67.4060603@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline In-Reply-To: <539C9D67.4060603@redhat.com> 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: Max Reitz Cc: kwolf@redhat.com, Peter Lieven , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , y-goto@jp.fujitsu.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 > >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. Sure. > > Other than that: > > Reviewed-by: Max Reitz