[Qemu-devel] [PULL 0/1]: QMP patches for 1.1

[Qemu-devel] [PULL 0/1]: QMP patches for 1.1

[Luiz Capitulino]

Only patch, from Michael, that fixes a bug in the QMP input visitor.

The changes (since 94d1991445fa3582c042ee4e5b72606e2fc39cc2) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Michael Roth (1):
      qapi: QMP input visitor, handle floats parsed as ints

 qapi/qmp-input-visitor.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 1/1] qapi: QMP input visitor, handle floats parsed as ints

[Luiz Capitulino]

From: Michael Roth <mdroth@linux.vnet.ibm.com>

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 <mdroth@linux.vnet.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Acked-by: Andreas Färber <afaerber@suse.de>
---
 qapi/qmp-input-visitor.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 4cdc47d..107d8d3 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -246,13 +246,18 @@ static void qmp_input_type_number(Visitor *v, double *obj, const char *name,
     QmpInputVisitor *qiv = to_qiv(v);
     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");
+                  "number");
         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.9.2.384.g4a92a

Re: [Qemu-devel] [PULL 0/1]: QMP patches for 1.1

[Anthony Liguori]

On 05/14/2012 08:25 AM, Luiz Capitulino wrote:
> Only patch, from Michael, that fixes a bug in the QMP input visitor.
>
> The changes (since 94d1991445fa3582c042ee4e5b72606e2fc39cc2) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Michael Roth (1):
>        qapi: QMP input visitor, handle floats parsed as ints
>
>   qapi/qmp-input-visitor.c |   11 ++++++++---
>   1 file changed, 8 insertions(+), 3 deletions(-)
>
>
>