[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/45] qnum: add uint type
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 12/45] qnum: add uint type |
Date: |
Wed, 31 May 2017 17:56:36 +0400 |
In order to store integer values superior to INT64_MAX, add a u64
internal representation.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/qapi/qmp/qnum.h | 4 ++++
qobject/qnum.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
tests/check-qnum.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 102 insertions(+)
diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h
index cc636fac5f..549b2117ec 100644
--- a/include/qapi/qmp/qnum.h
+++ b/include/qapi/qmp/qnum.h
@@ -18,6 +18,7 @@
typedef enum {
QNUM_I64,
+ QNUM_U64,
QNUM_DOUBLE
} QNumKind;
@@ -26,14 +27,17 @@ typedef struct QNum {
QNumKind kind;
union {
int64_t i64;
+ uint64_t u64;
double dbl;
} u;
} QNum;
QNum *qnum_from_int(int64_t value);
+QNum *qnum_from_uint(uint64_t value);
QNum *qnum_from_double(double value);
bool qnum_get_int(const QNum *qn, int64_t *val);
+bool qnum_get_uint(const QNum *qn, uint64_t *val);
double qnum_get_double(QNum *qn);
char *qnum_to_string(QNum *qn);
diff --git a/qobject/qnum.c b/qobject/qnum.c
index f16864160a..4ad37ed5bc 100644
--- a/qobject/qnum.c
+++ b/qobject/qnum.c
@@ -34,6 +34,22 @@ QNum *qnum_from_int(int64_t value)
}
/**
+ * qnum_from_uint(): Create a new QNum from an uint64_t
+ *
+ * Return strong reference.
+ */
+QNum *qnum_from_uint(uint64_t value)
+{
+ QNum *qn = g_new(QNum, 1);
+
+ qobject_init(QOBJECT(qn), QTYPE_QNUM);
+ qn->kind = QNUM_U64;
+ qn->u.u64 = value;
+
+ return qn;
+}
+
+/**
* qnum_from_double(): Create a new QNum from a double
*
* Return strong reference.
@@ -60,6 +76,37 @@ bool qnum_get_int(const QNum *qn, int64_t *val)
case QNUM_I64:
*val = qn->u.i64;
return true;
+ case QNUM_U64:
+ if (qn->u.u64 > INT64_MAX) {
+ return false;
+ }
+ *val = qn->u.u64;
+ return true;
+ case QNUM_DOUBLE:
+ return false;
+ }
+
+ g_assert_not_reached();
+ return false;
+}
+
+/**
+ * qnum_get_uint(): Get an unsigned integer from the number
+ *
+ * Return true on success.
+ */
+bool qnum_get_uint(const QNum *qn, uint64_t *val)
+{
+ switch (qn->kind) {
+ case QNUM_I64:
+ if (qn->u.i64 < 0) {
+ return false;
+ }
+ *val = qn->u.i64;
+ return true;
+ case QNUM_U64:
+ *val = qn->u.u64;
+ return true;
case QNUM_DOUBLE:
return false;
}
@@ -76,6 +123,8 @@ double qnum_get_double(QNum *qn)
switch (qn->kind) {
case QNUM_I64:
return qn->u.i64;
+ case QNUM_U64:
+ return qn->u.u64;
case QNUM_DOUBLE:
return qn->u.dbl;
}
@@ -91,6 +140,8 @@ char *qnum_to_string(QNum *qn)
switch (qn->kind) {
case QNUM_I64:
return g_strdup_printf("%" PRId64, qn->u.i64);
+ case QNUM_U64:
+ return g_strdup_printf("%" PRIu64, qn->u.u64);
case QNUM_DOUBLE:
/* FIXME: snprintf() is locale dependent; but JSON requires
* numbers to be formatted as if in the C locale. Dependence
diff --git a/tests/check-qnum.c b/tests/check-qnum.c
index 7cc4262ee7..234fd7fc82 100644
--- a/tests/check-qnum.c
+++ b/tests/check-qnum.c
@@ -35,6 +35,20 @@ static void qnum_from_int_test(void)
QDECREF(qi);
}
+static void qnum_from_uint_test(void)
+{
+ QNum *qu;
+ const int value = UINT_MAX;
+
+ qu = qnum_from_int(value);
+ g_assert(qu != NULL);
+ g_assert(qu->u.u64 == value);
+ g_assert(qu->base.refcnt == 1);
+ g_assert(qobject_type(QOBJECT(qu)) == QTYPE_QNUM);
+
+ QDECREF(qu);
+}
+
static void qnum_from_double_test(void)
{
QNum *qf;
@@ -73,6 +87,37 @@ static void qnum_get_int_test(void)
QDECREF(qi);
}
+static void qnum_get_uint_test(void)
+{
+ QNum *qn;
+ const int value = 123456;
+ uint64_t val;
+ int64_t ival;
+
+ qn = qnum_from_uint(value);
+ g_assert(qnum_get_uint(qn, &val));
+ g_assert_cmpuint(val, ==, value);
+ QDECREF(qn);
+
+ qn = qnum_from_int(value);
+ g_assert(qnum_get_uint(qn, &val));
+ g_assert_cmpuint(val, ==, value);
+ QDECREF(qn);
+
+ /* invalid cases */
+ qn = qnum_from_int(-1);
+ g_assert(!qnum_get_uint(qn, &val));
+ QDECREF(qn);
+
+ qn = qnum_from_uint(-1ULL);
+ g_assert(!qnum_get_int(qn, &ival));
+ QDECREF(qn);
+
+ qn = qnum_from_double(0.42);
+ g_assert(!qnum_get_uint(qn, &val));
+ QDECREF(qn);
+}
+
static void qobject_to_qnum_test(void)
{
QNum *qn;
@@ -109,9 +154,11 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
g_test_add_func("/qnum/from_int", qnum_from_int_test);
+ g_test_add_func("/qnum/from_uint", qnum_from_uint_test);
g_test_add_func("/qnum/from_double", qnum_from_double_test);
g_test_add_func("/qnum/from_int64", qnum_from_int64_test);
g_test_add_func("/qnum/get_int", qnum_get_int_test);
+ g_test_add_func("/qnum/get_uint", qnum_get_uint_test);
g_test_add_func("/qnum/to_qnum", qobject_to_qnum_test);
g_test_add_func("/qnum/to_string", qnum_to_string_test);
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PATCH v2 02/45] qapi: Document visit_type_any() issues with keyval input, (continued)
- [Qemu-devel] [PATCH v2 02/45] qapi: Document visit_type_any() issues with keyval input, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 03/45] tests/qapi-schema: Avoid 'str' in alternate test cases, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 04/45] qapi: Reject alternates that can't work with keyval_parse(), Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 05/45] qdev: remove PropertyInfo.qtype field, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 06/45] object: fix potential leak in getters, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 07/45] tests: remove alt num-int cases, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 08/45] tests: add more int/number ranges checks, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 10/45] qapi: Remove visit_start_alternate() parameter promote_int, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 09/45] qapi: merge QInt and QFloat in QNum, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 11/45] tests: remove /qnum/destroy test, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 12/45] qnum: add uint type,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 13/45] json: learn to parse uint64 numbers, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 14/45] qapi: update the qobject visitor to use QNUM_U64, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 15/45] object: add uint property setter/getter, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 16/45] q35: fix get_mmcfg_size to use uint64 visitor, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 17/45] object: use more specific property type names, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 18/45] qdev: make default property int, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 19/45] qdev: add unsigned properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 20/45] apic-common: make "id" property a uint32, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 21/45] qdev: use appropriate getter/setters type, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 22/45] isa: use get_uint() for "io-base", Marc-André Lureau, 2017/05/31