----- Original Message ----- > From: "Andreas Färber" <afaer...@suse.de> > To: "Igor Mammedov" <imamm...@redhat.com> > Cc: qemu-devel@nongnu.org, g...@redhat.com, ler...@redhat.com, > pbonz...@redhat.com, stefa...@linux.vnet.ibm.com, > mdr...@linux.vnet.ibm.com, ak...@redhat.com, ehabk...@redhat.com, > aligu...@us.ibm.com, mtosa...@redhat.com, "jan > kiszka" <jan.kis...@siemens.com>, blauwir...@gmail.com, a...@redhat.com > Sent: Friday, August 10, 2012 1:57:42 PM > Subject: Re: [RFC 12/20] add visitor for parsing hz[KMG] input string > > Am 10.08.2012 13:22, schrieb Igor Mammedov: > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > > --- > > qapi/qapi-visit-core.c | 11 +++++++++++ > > qapi/qapi-visit-core.h | 2 ++ > > qapi/string-input-visitor.c | 22 ++++++++++++++++++++++ > > 3 files changed, 35 insertions(+) > > > > diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c > > index 7a82b63..322cfa6 100644 > > --- a/qapi/qapi-visit-core.c > > +++ b/qapi/qapi-visit-core.c > > @@ -311,3 +311,14 @@ void input_type_enum(Visitor *v, int *obj, > > const char *strings[], > > g_free(enum_str); > > *obj = value; > > } > > + > > +void visit_type_hz(Visitor *v, int64_t *obj, const char *name, > > Error **errp) > > +{ > > + if (!error_is_set(errp)) { > > + if (v->type_hz) { > > + v->type_hz(v, obj, name, errp); > > + } else { > > + v->type_int(v, obj, name, errp); > > + } > > + } > > +} > > diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h > > index 60aceda..29d3038 100644 > > --- a/qapi/qapi-visit-core.h > > +++ b/qapi/qapi-visit-core.h > > @@ -62,6 +62,7 @@ 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); > > + void (*type_hz)(Visitor *v, int64_t *obj, const char *name, > > Error **errp); > > }; > > > > void visit_start_handle(Visitor *v, void **obj, const char *kind, > > @@ -91,5 +92,6 @@ 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_hz(Visitor *v, int64_t *obj, const char *name, > > Error **errp); > > > > #endif > > diff --git a/qapi/string-input-visitor.c > > b/qapi/string-input-visitor.c > > index 497eb9a..32e3780 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_hz(Visitor *v, int64_t *obj, const char > > *name, > > + Error **errp) > > +{ > > + StringInputVisitor *siv = DO_UPCAST(StringInputVisitor, > > visitor, v); > > + char *endp = (char *) siv->string; > > + long long val; > > + > > + errno = 0; > > + if (siv->string) { > > + val = strtosz_suffix_unit(siv->string, &endp, > > + STRTOSZ_DEFSUFFIX_B, 1000); > > + } > > + if (!siv->string || val == -1 || *endp) { > > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, > > + "a value representible as a non-negative int64"); > > Thunderbird suggests "representable". copy paste error, I'll fix source and here.
> > > + 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_hz = parse_type_hz; > > > > v->string = str; > > return v; > > I would prefer to stay physically exact and do s/hz/freq/g. ;) I'll do it next respin. > > Seems like a good idea to have a specialized visitor, didn't think of > that. Quite possibly there's use cases beyond tsc_freq that we might > want to switch as follow-ups. > > Regards, > Andreas > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG > Nürnberg > Thanks, Igor