[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/22] add visitor for parsing hz[KMG] input string
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 13/22] add visitor for parsing hz[KMG] input string |
Date: |
Wed, 26 Sep 2012 22:32:49 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
Acked-by: Andreas Färber <address@hidden>
---
v2:
* replaced _hz suffix for frequency visitor by _freq suffix
suggested-by: Andreas Färber
* fixed typo & extra space spotted-by: Andreas Färber
* initialize val, due to a silly CentOS6 compiler warning, that
breakes build when -Werror is set. suggested-by: Don Slutz
---
qapi/qapi-visit-core.c | 11 +++++++++++
qapi/qapi-visit-core.h | 2 ++
qapi/string-input-visitor.c | 22 ++++++++++++++++++++++
3 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 7a82b63..5c8705e 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_freq(Visitor *v, int64_t *obj, const char *name, Error **errp)
+{
+ if (!error_is_set(errp)) {
+ if (v->type_freq) {
+ v->type_freq(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..e5e7dd7 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_freq)(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_freq(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..74fe395 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_freq(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 = 0;
+
+ 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 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_freq = parse_type_freq;
v->string = str;
return v;
--
1.7.1
- [Qemu-devel] [PATCH 03/22] target-i386: if x86_cpu_realize() failed report error and do cleanup, (continued)
- [Qemu-devel] [PATCH 03/22] target-i386: if x86_cpu_realize() failed report error and do cleanup, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 01/22] target-i386: return Error from cpu_x86_find_by_name(), Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 02/22] target-i386: cpu_x86_register(): report error from property setter, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 04/22] target-i386: filter out not TCG features if running without kvm at realize time, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 06/22] target-i386: xlevel should be more than 0x80000000, move fixup into setter, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 05/22] target-i386: move out CPU features initialization in separate func, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 09/22] target-i386: convert 'hv_spinlocks' feature into property, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 10/22] target-i386: convert 'hv_relaxed' feature into property, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 12/22] target-i386: convert 'check' and 'enforce' features into properties, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 11/22] target-i386: convert 'hv_vapic' feature into property, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 13/22] add visitor for parsing hz[KMG] input string,
Igor Mammedov <=
- [Qemu-devel] [PATCH 15/22] target-i386: introduce vendor-override property, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 08/22] target-i386: add stubs for hyperv_(vapic_recommended|relaxed_timing_enabled|get_spinlock_retries)(), Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 20/22] target-i386: move init of "hypervisor" feature into CPU initializer from cpudef, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 21/22] target-i386: move default init of cpuid_kvm_features bitmap into CPU initializer from cpudef, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 07/22] target-i386: convert cpuid features into properties, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 18/22] target-i386: parse cpu_model string into set of stringified properties, Igor Mammedov, 2012/09/26
- [Qemu-devel] [PATCH 17/22] target-i386: replace uint32_t vendor fields by vendor string in x86_def_t, Igor Mammedov, 2012/09/26