From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th37F-0002Rx-2P for qemu-devel@nongnu.org; Fri, 07 Dec 2012 13:57:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th37D-00043b-10 for qemu-devel@nongnu.org; Fri, 07 Dec 2012 13:57:40 -0500 Received: from cantor2.suse.de ([195.135.220.15]:40016 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th37C-00043O-Kb for qemu-devel@nongnu.org; Fri, 07 Dec 2012 13:57:38 -0500 Message-ID: <50C23C1F.6010102@suse.de> Date: Fri, 07 Dec 2012 19:57:35 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1354828325-16568-1-git-send-email-imammedo@redhat.com> <1354828325-16568-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1354828325-16568-2-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/2] qapi: add visitor for parsing int[KMGT] input string List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org, ehabkost@redhat.com, mdroth@linux.vnet.ibm.com Am 06.12.2012 22:12, schrieb Igor Mammedov: > Caller of visit_type_unit_suffixed_int() will have to specify > value of 'K' suffix via unit argument. > For Kbytes it's 1024, for Khz it's 1000. >=20 > Signed-off-by: Igor Mammedov > --- > v2: > - convert type_freq to type_unit_suffixed_int. > - provide qapi_dealloc_type_unit_suffixed_int() impl. > --- > qapi/qapi-dealloc-visitor.c | 7 +++++++ > qapi/qapi-visit-core.c | 13 +++++++++++++ > qapi/qapi-visit-core.h | 8 ++++++++ > qapi/string-input-visitor.c | 22 ++++++++++++++++++++++ > 4 files changed, 50 insertions(+) >=20 > diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c > index 75214e7..57e662c 100644 > --- a/qapi/qapi-dealloc-visitor.c > +++ b/qapi/qapi-dealloc-visitor.c > @@ -143,6 +143,12 @@ static void qapi_dealloc_type_enum(Visitor *v, int= *obj, const char *strings[], > { > } > =20 > +static void qapi_dealloc_type_unit_suffixed_int(Visitor *v, int64_t *o= bj, > + const char *name, > + const int unit, Error = **errp) > +{ > +} > + > Visitor *qapi_dealloc_get_visitor(QapiDeallocVisitor *v) > { > return &v->visitor; > @@ -170,6 +176,7 @@ QapiDeallocVisitor *qapi_dealloc_visitor_new(void) > v->visitor.type_str =3D qapi_dealloc_type_str; > v->visitor.type_number =3D qapi_dealloc_type_number; > v->visitor.type_size =3D qapi_dealloc_type_size; > + v->visitor.type_unit_suffixed_int =3D qapi_dealloc_type_unit_suffi= xed_int; > =20 > QTAILQ_INIT(&v->stack); > =20 > diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c > index 7a82b63..dcbc1a9 100644 > --- a/qapi/qapi-visit-core.c > +++ b/qapi/qapi-visit-core.c > @@ -311,3 +311,16 @@ void input_type_enum(Visitor *v, int *obj, const c= har *strings[], > g_free(enum_str); > *obj =3D value; > } > + > +void visit_type_unit_suffixed_int(Visitor *v, int64_t *obj, const char= *name, > + const int unit, Error **errp) > +{ > + if (!error_is_set(errp)) { if (error_is_set(errp)) { > + return; > + } > + if (v->type_unit_suffixed_int) { > + v->type_unit_suffixed_int(v, obj, name, unit, errp); > + } else { > + visit_type_int64(v, obj, name, errp); > + } > +} > diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h > index 60aceda..04e690a 100644 > --- a/qapi/qapi-visit-core.h > +++ b/qapi/qapi-visit-core.h > @@ -62,6 +62,12 @@ struct Visitor > void (*type_int64)(Visitor *v, int64_t *obj, const char *name, Err= or **errp); > /* visit_type_size() falls back to (*type_uint64)() if type_size i= s unset */ > void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Err= or **errp); > + /* > + * visit_unit_suffixed_int() falls back to (*type_int64)() > + * if type_unit_suffixed_int is unset > + */ Indentation is one off. > + void (*type_unit_suffixed_int)(Visitor *v, int64_t *obj, const cha= r *name, > + const int unit, Error **errp); Are we expecting differently suffixed ints? Otherwise we could optionally shorten to type_suffixed_int (but that probably still doesn't fit within one comment line ;)). > }; > =20 > void visit_start_handle(Visitor *v, void **obj, const char *kind, > @@ -91,5 +97,7 @@ void visit_type_size(Visitor *v, uint64_t *obj, const= char *name, Error **errp); > void visit_type_bool(Visitor *v, bool *obj, const char *name, Error **= errp); > void visit_type_str(Visitor *v, char **obj, const char *name, Error **= errp); > void visit_type_number(Visitor *v, double *obj, const char *name, Erro= r **errp); > +void visit_type_unit_suffixed_int(Visitor *v, int64_t *obj, const char= *name, > + const int unit, Error **errp); > =20 > #endif > diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c > index 497eb9a..d2bd154 100644 > --- a/qapi/string-input-visitor.c > +++ b/qapi/string-input-visitor.c > @@ -110,6 +110,27 @@ static void parse_start_optional(Visitor *v, bool = *present, > *present =3D true; > } > =20 > +static void parse_type_unit_suffixed_int(Visitor *v, int64_t *obj, > + const char *name, const int u= nit, > + Error **errp) > +{ > + StringInputVisitor *siv =3D DO_UPCAST(StringInputVisitor, visitor,= v); > + char *endp =3D (char *) siv->string; > + long long val =3D 0; > + > + if (siv->string) { > + val =3D strtosz_suffix_unit(siv->string, &endp, > + STRTOSZ_DEFSUFFIX_B, unit); > + } > + if (!siv->string || val =3D=3D -1 || *endp) { > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, > + "a value representable as a non-negative int64"); Weird indentation remaining, looks as if we could align with errp within 80 chars. However, I wonder if "unit" is the (physically etc.) correct term here? Isn't the "unit" Hz / byte / ... and 1000 more of a conversion factor or something? At least that's the way I've seen unit used in the API of another project, passing an enum of Hertz, gram, meter/second, etc. Andreas > + return; > + } > + > + *obj =3D val; > +} > + > Visitor *string_input_get_visitor(StringInputVisitor *v) > { > return &v->visitor; > @@ -132,6 +153,7 @@ StringInputVisitor *string_input_visitor_new(const = char *str) > v->visitor.type_str =3D parse_type_str; > v->visitor.type_number =3D parse_type_number; > v->visitor.start_optional =3D parse_start_optional; > + v->visitor.type_unit_suffixed_int =3D parse_type_unit_suffixed_int= ; > =20 > v->string =3D str; > return v; >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg