diff options
| -rw-r--r-- | scripts/qapi.py | 10 | ||||
| -rw-r--r-- | tests/qapi-schema/args-invalid.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/args-invalid.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-data-invalid.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/struct-member-invalid.json | 1 |
7 files changed, 9 insertions, 10 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 197db77a9f..36560590ba 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -462,13 +462,15 @@ def check_type(expr_info, source, value, allow_array = False, % (source, all_names[value], orig_value)) return - # value is a dictionary, check that each member is okay - if not isinstance(value, OrderedDict): - raise QAPIExprError(expr_info, - "%s should be a dictionary" % source) if not allow_dict: raise QAPIExprError(expr_info, "%s should be a type name" % source) + + if not isinstance(value, OrderedDict): + raise QAPIExprError(expr_info, + "%s should be a dictionary or type name" % source) + + # value is a dictionary, check that each member is okay for (key, arg) in value.items(): check_name(expr_info, "Member of %s" % source, key, allow_optional=allow_optional) diff --git a/tests/qapi-schema/args-invalid.err b/tests/qapi-schema/args-invalid.err index 6d0fa05c80..fe1e94975b 100644 --- a/tests/qapi-schema/args-invalid.err +++ b/tests/qapi-schema/args-invalid.err @@ -1 +1 @@ -tests/qapi-schema/args-invalid.json:2: 'data' for command 'foo' should be a dictionary +tests/qapi-schema/args-invalid.json:1: 'data' for command 'foo' should be a dictionary or type name diff --git a/tests/qapi-schema/args-invalid.json b/tests/qapi-schema/args-invalid.json index 4a641350e3..db0981341b 100644 --- a/tests/qapi-schema/args-invalid.json +++ b/tests/qapi-schema/args-invalid.json @@ -1,3 +1,2 @@ -# FIXME error "should be a dictionary" is misleading, type name is also fine { 'command': 'foo', 'data': false } diff --git a/tests/qapi-schema/struct-data-invalid.err b/tests/qapi-schema/struct-data-invalid.err index a40e23aaea..6644f4c2ad 100644 --- a/tests/qapi-schema/struct-data-invalid.err +++ b/tests/qapi-schema/struct-data-invalid.err @@ -1 +1 @@ -tests/qapi-schema/struct-data-invalid.json:2: 'data' for struct 'foo' should be a dictionary +tests/qapi-schema/struct-data-invalid.json:1: 'data' for struct 'foo' should be a dictionary or type name diff --git a/tests/qapi-schema/struct-data-invalid.json b/tests/qapi-schema/struct-data-invalid.json index b76de82552..9adbc3bb6b 100644 --- a/tests/qapi-schema/struct-data-invalid.json +++ b/tests/qapi-schema/struct-data-invalid.json @@ -1,3 +1,2 @@ -# FIXME error "should be a dictionary" is misleading, type name is also fine { 'struct': 'foo', 'data': false } diff --git a/tests/qapi-schema/struct-member-invalid.err b/tests/qapi-schema/struct-member-invalid.err index 9e4c7b85ff..69a326d450 100644 --- a/tests/qapi-schema/struct-member-invalid.err +++ b/tests/qapi-schema/struct-member-invalid.err @@ -1 +1 @@ -tests/qapi-schema/struct-member-invalid.json:2: Member 'a' of 'data' for struct 'foo' should be a dictionary +tests/qapi-schema/struct-member-invalid.json:1: Member 'a' of 'data' for struct 'foo' should be a type name diff --git a/tests/qapi-schema/struct-member-invalid.json b/tests/qapi-schema/struct-member-invalid.json index 968e63cb8e..8f172f7a87 100644 --- a/tests/qapi-schema/struct-member-invalid.json +++ b/tests/qapi-schema/struct-member-invalid.json @@ -1,3 +1,2 @@ -# FIXME error message "should be a dictionary" is wrong, must be type name { 'struct': 'foo', 'data': { 'a': false } } |