[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 09/15] qapi: Fix alternates that accept 'number'
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 09/15] qapi: Fix alternates that accept 'number' but not 'int' |
Date: |
Wed, 7 Oct 2015 20:00:44 -0600 |
The QMP input visitor allows integral values to be assigned by
promotion to a QTYPE_QFLOAT. However, when parsing an alternate,
we did not take this into account, such that an alternate that
accepts 'number' but not 'int' would reject integral values.
With this patch, we now have the following desirable table:
alternate has case selected for
'int' 'number' QTYPE_QINT QTYPE_QFLOAT
no no error error
no yes 'number' 'number'
yes no 'int' error
yes yes 'int' 'number'
While it is unlikely that we will ever use 'number' in an
alternate other than in the testsuite, it never hurts to be
more precise in what we allow.
Signed-off-by: Eric Blake <address@hidden>
---
v6: rebase onto earlier testsuite and gen_err_check() improvements
---
include/qapi/visitor-impl.h | 2 +-
include/qapi/visitor.h | 3 ++-
qapi/qapi-visit-core.c | 4 ++--
qapi/qmp-input-visitor.c | 4 ++++
scripts/qapi-visit.py | 9 +++++++--
tests/test-qmp-input-visitor.c | 20 ++++++--------------
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h
index 6d95b36..1d09b7b 100644
--- a/include/qapi/visitor-impl.h
+++ b/include/qapi/visitor-impl.h
@@ -33,7 +33,7 @@ struct Visitor
void (*type_enum)(Visitor *v, int *obj, const char * const strings[],
const char *kind, const char *name, Error **errp);
/* May be NULL; most useful for input visitors. */
- void (*get_next_type)(Visitor *v, qtype_code *type,
+ void (*get_next_type)(Visitor *v, qtype_code *type, bool promote_int,
const char *name, Error **errp);
void (*type_int)(Visitor *v, int64_t *obj, const char *name, Error **errp);
diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
index b765993..baea594 100644
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@@ -46,8 +46,9 @@ void visit_optional(Visitor *v, bool *present, const char
*name,
* Determine the qtype of the item @name in the current object visit.
* For input visitors, set address@hidden to the correct qtype of a qapi
* alternate type; for other visitors, leave address@hidden unchanged.
+ * If @promote_int, treat integers as QTYPE_FLOAT.
*/
-void visit_get_next_type(Visitor *v, qtype_code *type,
+void visit_get_next_type(Visitor *v, qtype_code *type, bool promote_int,
const char *name, Error **errp);
void visit_type_enum(Visitor *v, int *obj, const char * const strings[],
const char *kind, const char *name, Error **errp);
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 3f24daa..884fe94 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -81,11 +81,11 @@ void visit_optional(Visitor *v, bool *present, const char
*name,
}
}
-void visit_get_next_type(Visitor *v, qtype_code *type,
+void visit_get_next_type(Visitor *v, qtype_code *type, bool promote_int,
const char *name, Error **errp)
{
if (v->get_next_type) {
- v->get_next_type(v, type, name, errp);
+ v->get_next_type(v, type, promote_int, name, errp);
}
}
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 803ffad..5310db5 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -209,6 +209,7 @@ static void qmp_input_end_list(Visitor *v, Error **errp)
}
static void qmp_input_get_next_type(Visitor *v, qtype_code *type,
+ bool promote_int,
const char *name, Error **errp)
{
QmpInputVisitor *qiv = to_qiv(v);
@@ -219,6 +220,9 @@ static void qmp_input_get_next_type(Visitor *v, qtype_code
*type,
return;
}
*type = qobject_type(qobj);
+ if (promote_int && *type == QTYPE_QINT) {
+ *type = QTYPE_QFLOAT;
+ }
}
static void qmp_input_type_int(Visitor *v, int64_t *obj, const char *name,
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 571bfa3..1ac5350 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -169,6 +169,11 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s *obj,
const char *name, Error
def gen_visit_alternate(name, variants):
+ promote_int = 'true'
+ for var in variants.variants:
+ if var.type.alternate_qtype() == 'QTYPE_QINT':
+ promote_int = 'false'
+
ret = mcgen('''
void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name,
Error **errp)
@@ -179,13 +184,13 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj,
const char *name, Error
if (err) {
goto out;
}
- visit_get_next_type(v, &(*obj)->type, name, &err);
+ visit_get_next_type(v, &(*obj)->type, %(promote_int)s, name, &err);
if (err) {
goto out_obj;
}
switch ((*obj)->type) {
''',
- c_name=c_name(name))
+ c_name=c_name(name), promote_int=promote_int)
for var in variants.variants:
ret += mcgen('''
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index c5ed19a..51f1fb7 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -381,25 +381,17 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
qapi_free_AltStrBool(asb);
visitor_input_teardown(data, NULL);
- /* FIXME: integer should parse as number */
v = visitor_input_test_init(data, "42");
- visit_type_AltStrNum(v, &asn, NULL, &err);
- /* FIXME g_assert_cmpint(asn->type, ==, QTYPE_QFLOAT); */
- /* FIXME g_assert_cmpfloat(asn->n, ==, 42); */
- g_assert(err);
- error_free(err);
- err = NULL;
+ visit_type_AltStrNum(v, &asn, NULL, &error_abort);
+ g_assert_cmpint(asn->type, ==, QTYPE_QFLOAT);
+ g_assert_cmpfloat(asn->n, ==, 42);
qapi_free_AltStrNum(asn);
visitor_input_teardown(data, NULL);
- /* FIXME: integer should parse as number */
v = visitor_input_test_init(data, "42");
- visit_type_AltNumStr(v, &ans, NULL, &err);
- /* FIXME g_assert_cmpint(ans->type, ==, QTYPE_QFLOAT); */
- /* FIXME g_assert_cmpfloat(ans->n, ==, 42); */
- g_assert(err);
- error_free(err);
- err = NULL;
+ visit_type_AltNumStr(v, &ans, NULL, &error_abort);
+ g_assert_cmpint(ans->type, ==, QTYPE_QFLOAT);
+ g_assert_cmpfloat(ans->n, ==, 42);
qapi_free_AltNumStr(ans);
visitor_input_teardown(data, NULL);
--
2.4.3
- [Qemu-devel] [PATCH v6 01/15] qapi: Move empty-enum to compile-time test, (continued)
- [Qemu-devel] [PATCH v6 01/15] qapi: Move empty-enum to compile-time test, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 03/15] qapi: Drop redundant flat-union-reverse-define test, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 15/15] qapi: Simplify visits of optional fields, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 08/15] qapi: Simplify visiting of alternate types, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 02/15] qapi: Drop redundant returns-int test, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 13/15] qapi: Test failure in middle of array parse, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 06/15] qapi-introspect: Guarantee particular sorting, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 04/15] qapi: Use generated TestStruct machinery in tests, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 07/15] qapi: Change alternate layout to use 'type', Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 14/15] qapi: More tests of input arrays, Eric Blake, 2015/10/08
- [Qemu-devel] [PATCH v6 09/15] qapi: Fix alternates that accept 'number' but not 'int',
Eric Blake <=
- [Qemu-devel] [PATCH v6 12/15] qapi: Simplify error testing in test-qmp-*, Eric Blake, 2015/10/08
- Re: [Qemu-devel] [PATCH v6 00/15] post-introspection cleanups, subset C, Eric Blake, 2015/10/16