From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgvsD-000283-03 for qemu-devel@nongnu.org; Mon, 05 Sep 2016 11:31:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgvsA-0007TJ-Lx for qemu-devel@nongnu.org; Mon, 05 Sep 2016 11:31:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgvsA-0007TE-E0 for qemu-devel@nongnu.org; Mon, 05 Sep 2016 11:31:46 -0400 From: "Daniel P. Berrange" Date: Mon, 5 Sep 2016 16:16:36 +0100 Message-Id: <1473088600-17930-3-git-send-email-berrange@redhat.com> In-Reply-To: <1473088600-17930-1-git-send-email-berrange@redhat.com> References: <1473088600-17930-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v11 2/6] option: make parse_option_bool/number non-static List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Max Reitz , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eric Blake , "Daniel P. Berrange" The opts-visitor.c opts_type_bool() method has code for parsing a string to set a bool value, as does the qemu-option.c parse_option_bool() method, except it handles fewer cases. To enable consistency across the codebase, extend parse_option_bool() to handle "yes", "no", "y" and "n", and make it non-static. Convert the opts visitor to call this method directly. Also make parse_option_number() non-static to allow for similar reuse later. Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-by: Daniel P. Berrange --- include/qemu/option.h | 4 ++++ qapi/opts-visitor.c | 19 +------------------ util/qemu-option.c | 27 ++++++++++++++++----------- 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index 1f9e3f9..2a5266f 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -37,6 +37,10 @@ int get_param_value(char *buf, int buf_size, const char *tag, const char *str); =20 =20 +void parse_option_bool(const char *name, const char *value, bool *ret, + Error **errp); +void parse_option_number(const char *name, const char *value, + uint64_t *ret, Error **errp); void parse_option_size(const char *name, const char *value, uint64_t *ret, Error **errp); bool has_help_option(const char *param); diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 1048bbc..084f7cc 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -334,7 +334,6 @@ opts_type_str(Visitor *v, const char *name, char **ob= j, Error **errp) } =20 =20 -/* mimics qemu-option.c::parse_option_bool() */ static void opts_type_bool(Visitor *v, const char *name, bool *obj, Error **errp) { @@ -346,23 +345,7 @@ opts_type_bool(Visitor *v, const char *name, bool *o= bj, Error **errp) return; } =20 - if (opt->str) { - if (strcmp(opt->str, "on") =3D=3D 0 || - strcmp(opt->str, "yes") =3D=3D 0 || - strcmp(opt->str, "y") =3D=3D 0) { - *obj =3D true; - } else if (strcmp(opt->str, "off") =3D=3D 0 || - strcmp(opt->str, "no") =3D=3D 0 || - strcmp(opt->str, "n") =3D=3D 0) { - *obj =3D false; - } else { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, - "on|yes|y|off|no|n"); - return; - } - } else { - *obj =3D true; - } + parse_option_bool(opt->name, opt->str, obj, errp); =20 processed(ov, name); } diff --git a/util/qemu-option.c b/util/qemu-option.c index 3467dc2..6fc9ccb 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -125,25 +125,30 @@ int get_param_value(char *buf, int buf_size, return get_next_param_value(buf, buf_size, tag, &str); } =20 -static void parse_option_bool(const char *name, const char *value, bool = *ret, - Error **errp) +void parse_option_bool(const char *name, const char *value, bool *ret, + Error **errp) { if (value !=3D NULL) { - if (!strcmp(value, "on")) { - *ret =3D 1; - } else if (!strcmp(value, "off")) { - *ret =3D 0; + if (strcmp(value, "on") =3D=3D 0 || + strcmp(value, "yes") =3D=3D 0 || + strcmp(value, "y") =3D=3D 0) { + *ret =3D true; + } else if (strcmp(value, "off") =3D=3D 0 || + strcmp(value, "no") =3D=3D 0 || + strcmp(value, "n") =3D=3D 0) { + *ret =3D false; } else { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - name, "'on' or 'off'"); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name, + "on|yes|y|off|no|n"); + return; } } else { - *ret =3D 1; + *ret =3D true; } } =20 -static void parse_option_number(const char *name, const char *value, - uint64_t *ret, Error **errp) +void parse_option_number(const char *name, const char *value, + uint64_t *ret, Error **errp) { char *postfix; uint64_t number; --=20 2.7.4