From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48391)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ndevos@redhat.com>) id 1cjgoN-0005Kv-3c
	for qemu-devel@nongnu.org; Fri, 03 Mar 2017 01:35:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ndevos@redhat.com>) id 1cjgoM-0006BH-3W
	for qemu-devel@nongnu.org; Fri, 03 Mar 2017 01:35:31 -0500
Date: Thu, 2 Mar 2017 22:35:23 -0800
From: Niels de Vos <ndevos@redhat.com>
Message-ID: <20170303063523.GQ16140@ndevos-x240.usersys.redhat.com>
References: <1488491046-2549-1-git-send-email-armbru@redhat.com>
	<1488491046-2549-12-git-send-email-armbru@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1488491046-2549-12-git-send-email-armbru@redhat.com>
Subject: Re: [Qemu-devel] [Qemu-block] [PATCH 11/15] gluster: Don't
 duplicate qapi-util.c's qapi_enum_parse()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Markus Armbruster <armbru@redhat.com>
Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mitake.hitoshi@lab.ntt.co.jp, qemu-block@nongnu.org, namei.unix@gmail.com

On Thu, Mar 02, 2017 at 10:44:02PM +0100, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  block/gluster.c | 30 +++++++++---------------------
>  1 file changed, 9 insertions(+), 21 deletions(-)
> 
> diff --git a/block/gluster.c b/block/gluster.c
> index 7236d59..6fbcf9e 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -12,6 +12,7 @@
>  #include "block/block_int.h"
>  #include "qapi/error.h"
>  #include "qapi/qmp/qerror.h"
> +#include "qapi/util.h"
>  #include "qemu/uri.h"
>  #include "qemu/error-report.h"
>  #include "qemu/cutils.h"
> @@ -472,23 +473,6 @@ out:
>      return NULL;
>  }
>  
> -static int qapi_enum_parse(const char *opt)
> -{
> -    int i;
> -
> -    if (!opt) {
> -        return GLUSTER_TRANSPORT__MAX;
> -    }
> -
> -    for (i = 0; i < GLUSTER_TRANSPORT__MAX; i++) {
> -        if (!strcmp(opt, GlusterTransport_lookup[i])) {
> -            return i;
> -        }
> -    }
> -
> -    return i;
> -}
> -
>  /*
>   * Convert the json formatted command line into qapi.
>  */
> @@ -546,16 +530,20 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
>  
>          ptr = qemu_opt_get(opts, GLUSTER_OPT_TYPE);
>          gsconf = g_new0(GlusterServer, 1);
> -        gsconf->type = qapi_enum_parse(ptr);
> +        gsconf->type = qapi_enum_parse(GlusterTransport_lookup, ptr,
> +                                       GLUSTER_TRANSPORT__MAX,
> +                                       GLUSTER_TRANSPORT__MAX,
> +                                       &local_err);
>          if (!ptr) {
>              error_setg(&local_err, QERR_MISSING_PARAMETER, GLUSTER_OPT_TYPE);
>              error_append_hint(&local_err, GERR_INDEX_HINT, i);
>              goto out;
>  
>          }
> -        if (gsconf->type == GLUSTER_TRANSPORT__MAX) {
> -            error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE,
> -                       GLUSTER_OPT_TYPE, "tcp or unix");
> +        if (local_err) {
> +            error_append_hint(&local_err,
> +                              "Parameter '%s' may be 'tcp' or 'unix'\n",
> +                              GLUSTER_OPT_TYPE);
>              error_append_hint(&local_err, GERR_INDEX_HINT, i);
>              goto out;
>          }
> -- 
> 2.7.4
> 
> 

Looks good to me.

Reviewed-by: Niels de Vos <ndevos@redhat.com>