From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSvY2-0000mC-Am for qemu-devel@nongnu.org; Fri, 11 May 2012 15:30:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSvY0-0001ag-GT for qemu-devel@nongnu.org; Fri, 11 May 2012 15:30:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24490) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSvY0-0001aL-38 for qemu-devel@nongnu.org; Fri, 11 May 2012 15:30:40 -0400 Date: Fri, 11 May 2012 16:30:40 -0300 From: Luiz Capitulino Message-ID: <20120511163040.5c3b825e@doriath.home> In-Reply-To: <1336758204-9118-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1336758204-9118-1-git-send-email-mdroth@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1.1] qapi: QMP input visitor, handle floats parsed as ints List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, afaerber@suse.de On Fri, 11 May 2012 12:43:24 -0500 Michael Roth wrote: > 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 Applied to the QMP branch, thanks. > --- > qapi/qmp-input-visitor.c | 11 ++++++++--- > 1 files 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,