|
 |
9ae3a8 |
From 889862b6101fb71fd19fdae0ffa18815446be0a5 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <889862b6101fb71fd19fdae0ffa18815446be0a5.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 10 Dec 2013 15:29:05 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 05/21] qapi: add QMP input test for large integers
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1386689361-30281-3-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56123
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 02/18] qapi: add QMP input test for large integers
|
|
|
9ae3a8 |
Bugzilla: 997915
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Large integers previously got capped to LLONG_MAX/LLONG_MIN so we could
|
|
|
9ae3a8 |
store them as int64_t. This could lead to silent errors occuring.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Now, we use a double to handle these cases.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Add a test to confirm that QMPInputVisitor handles this as expected if
|
|
|
9ae3a8 |
we're expected an integer value: errors for out of range integer values
|
|
|
9ae3a8 |
that got promoted to doubles in this fashion.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit e92cfa0d90c618ff1f131c60ef1b27aa6fe69a0a)
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/test-qmp-input-visitor.c | 20 ++++++++++++++++++++
|
|
|
9ae3a8 |
1 file changed, 20 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/test-qmp-input-visitor.c | 20 ++++++++++++++++++++
|
|
|
9ae3a8 |
1 file changed, 20 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
|
|
|
9ae3a8 |
index 955a4c0..b308cf9 100644
|
|
|
9ae3a8 |
--- a/tests/test-qmp-input-visitor.c
|
|
|
9ae3a8 |
+++ b/tests/test-qmp-input-visitor.c
|
|
|
9ae3a8 |
@@ -75,6 +75,24 @@ static void test_visitor_in_int(TestInputVisitorData *data,
|
|
|
9ae3a8 |
g_assert_cmpint(res, ==, value);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+static void test_visitor_in_int_overflow(TestInputVisitorData *data,
|
|
|
9ae3a8 |
+ const void *unused)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ int64_t res = 0;
|
|
|
9ae3a8 |
+ Error *errp = NULL;
|
|
|
9ae3a8 |
+ Visitor *v;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /* this will overflow a Qint/int64, so should be deserialized into
|
|
|
9ae3a8 |
+ * a QFloat/double field instead, leading to an error if we pass it
|
|
|
9ae3a8 |
+ * to visit_type_int. confirm this.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ v = visitor_input_test_init(data, "%f", DBL_MAX);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ visit_type_int(v, &res, NULL, &errp);
|
|
|
9ae3a8 |
+ g_assert(error_is_set(&errp));
|
|
|
9ae3a8 |
+ error_free(errp);
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
static void test_visitor_in_bool(TestInputVisitorData *data,
|
|
|
9ae3a8 |
const void *unused)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
@@ -292,6 +310,8 @@ int main(int argc, char **argv)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
input_visitor_test_add("/visitor/input/int",
|
|
|
9ae3a8 |
&in_visitor_data, test_visitor_in_int);
|
|
|
9ae3a8 |
+ input_visitor_test_add("/visitor/input/int_overflow",
|
|
|
9ae3a8 |
+ &in_visitor_data, test_visitor_in_int_overflow);
|
|
|
9ae3a8 |
input_visitor_test_add("/visitor/input/bool",
|
|
|
9ae3a8 |
&in_visitor_data, test_visitor_in_bool);
|
|
|
9ae3a8 |
input_visitor_test_add("/visitor/input/number",
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|