From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgjsW-0003fm-93 for qemu-devel@nongnu.org; Thu, 06 Dec 2012 17:25:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgjsU-0007EK-S9 for qemu-devel@nongnu.org; Thu, 06 Dec 2012 17:25:12 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:44248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgjsU-0007EC-Lu for qemu-devel@nongnu.org; Thu, 06 Dec 2012 17:25:10 -0500 Received: by mail-ie0-f181.google.com with SMTP id 16so11305719iea.40 for ; Thu, 06 Dec 2012 14:25:09 -0800 (PST) Sender: fluxion Date: Thu, 6 Dec 2012 16:24:05 -0600 From: mdroth Message-ID: <20121206222405.GB30686@vm> References: <1354828325-16568-1-git-send-email-imammedo@redhat.com> <1354828325-16568-2-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1354828325-16568-2-git-send-email-imammedo@redhat.com> 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, afaerber@suse.de On Thu, Dec 06, 2012 at 10:12:04PM +0100, Igor Mammedov wrote: > 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. > > Signed-off-by: Igor Mammedov Reviewed-by: Michael Roth > --- > 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(+) > > 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[], > { > } > > +static void qapi_dealloc_type_unit_suffixed_int(Visitor *v, int64_t *obj, > + 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 = qapi_dealloc_type_str; > v->visitor.type_number = qapi_dealloc_type_number; > v->visitor.type_size = qapi_dealloc_type_size; > + v->visitor.type_unit_suffixed_int = qapi_dealloc_type_unit_suffixed_int; > > QTAILQ_INIT(&v->stack); > > 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 char *strings[], > g_free(enum_str); > *obj = 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)) { > + 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, Error **errp); > /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ > void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp); > + /* > + * visit_unit_suffixed_int() falls back to (*type_int64)() > + * if type_unit_suffixed_int is unset > + */ > + void (*type_unit_suffixed_int)(Visitor *v, int64_t *obj, const char *name, > + const int unit, Error **errp); > }; > > 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, Error **errp); > +void visit_type_unit_suffixed_int(Visitor *v, int64_t *obj, const char *name, > + const int unit, Error **errp); > > #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 = true; > } > > +static void parse_type_unit_suffixed_int(Visitor *v, int64_t *obj, > + const char *name, const int unit, > + Error **errp) > +{ > + StringInputVisitor *siv = DO_UPCAST(StringInputVisitor, visitor, v); > + char *endp = (char *) siv->string; > + long long val = 0; > + > + if (siv->string) { > + val = strtosz_suffix_unit(siv->string, &endp, > + STRTOSZ_DEFSUFFIX_B, unit); > + } > + if (!siv->string || val == -1 || *endp) { > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, > + "a value representable as a non-negative int64"); > + return; > + } > + > + *obj = 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 = parse_type_str; > v->visitor.type_number = parse_type_number; > v->visitor.start_optional = parse_start_optional; > + v->visitor.type_unit_suffixed_int = parse_type_unit_suffixed_int; > > v->string = str; > return v; > -- > 1.7.11.7 >