[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 3/7] qapi: QMP input visitor, handle floats parse
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH v3 3/7] qapi: QMP input visitor, handle floats parsed as ints |
Date: |
Mon, 5 Mar 2012 13:10:30 -0600 |
JSON numbers can be interpreted as either integers or floating point
values depending on their representation. As a result, QMP input visitor
might visit a QInt when it was expecting a QFloat, so add handling to
account for this.
Signed-off-by: Michael Roth <address@hidden>
---
qapi/qmp-input-visitor.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index e6b6152..f7ffb59 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -209,13 +209,18 @@ static void qmp_input_type_number(Visitor *v, double
*obj, const char *name,
QmpInputVisitor *qiv = to_qiv(v);
const QObject *qobj = qmp_input_get_object(qiv, name);
- if (!qobj || qobject_type(qobj) != QTYPE_QFLOAT) {
+ if (!qobj || (qobject_type(qobj) != QTYPE_QFLOAT &&
+ qobject_type(qobj) != QTYPE_QINT)) {
error_set(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"double");
return;
}
- *obj = qfloat_get_double(qobject_to_qfloat(qobj));
+ if (qobject_type(qobj) == QTYPE_QINT) {
+ *obj = qint_get_int(qobject_to_qint(qobj));
+ } else {
+ *obj = qfloat_get_double(qobject_to_qfloat(qobj));
+ }
}
static void qmp_input_start_optional(Visitor *v, bool *present,
--
1.7.4.1
- [Qemu-devel] [PATCH v3 0/7] add fixed-width visitors and serialization tests, Michael Roth, 2012/03/05
- [Qemu-devel] [PATCH v3 2/7] qapi: unit tests for visitor-based serialization, Michael Roth, 2012/03/05
- [Qemu-devel] [PATCH v3 3/7] qapi: QMP input visitor, handle floats parsed as ints,
Michael Roth <=
- [Qemu-devel] [PATCH v3 4/7] qapi: add String visitor coverage to serialization unit tests, Michael Roth, 2012/03/05
- [Qemu-devel] [PATCH v3 6/7] qdev: use int32_t container for devfn property, Michael Roth, 2012/03/05
- [Qemu-devel] [PATCH v3 7/7] qdev: switch property accessors to fixed-width visitor interfaces, Michael Roth, 2012/03/05
- [Qemu-devel] [PATCH v3 1/7] qapi: add Visitor interfaces for uint*_t and int*_t, Michael Roth, 2012/03/05
- [Qemu-devel] [PATCH v3 5/7] qapi: String visitor, use %f represenation for floats, Michael Roth, 2012/03/05