diff options
| author | Markus Armbruster <armbru@redhat.com> | 2023-03-16 08:13:16 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2023-04-24 15:21:39 +0200 |
| commit | 2a0c975f86a24f18b90fc4d65fe8984253fd4562 (patch) | |
| tree | 213a69a540ab93bc7d4892c48377146e7b2d94df | |
| parent | 06cc46eeaf3cf5790c85ebbb58e8875719e5eb86 (diff) | |
| download | qemu-2a0c975f86a24f18b90fc4d65fe8984253fd4562.zip qemu-2a0c975f86a24f18b90fc4d65fe8984253fd4562.tar.gz qemu-2a0c975f86a24f18b90fc4d65fe8984253fd4562.tar.bz2 | |
qapi: Improve error message for unexpected array types
We reject array types in certain places with "cannot be an array".
Deleting this check improves the error message to "should be a type
name" or "should be an object or type name", depending on context, so
do that.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-6-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
| -rw-r--r-- | scripts/qapi/expr.py | 6 | ||||
| -rw-r--r-- | tests/qapi-schema/bad-data.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/union-array-branch.err | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index bc04bf3..5abeaa1 100644 --- a/scripts/qapi/expr.py +++ b/scripts/qapi/expr.py @@ -341,9 +341,6 @@ def check_type_name(value: Optional[object], if isinstance(value, str): return - if isinstance(value, list): - raise QAPISemError(info, "%s cannot be an array" % source) - raise QAPISemError(info, "%s should be a type name" % source) @@ -392,9 +389,6 @@ def check_type_name_or_implicit(value: Optional[object], if isinstance(value, str): return - if isinstance(value, list): - raise QAPISemError(info, "%s cannot be an array" % source) - if not isinstance(value, dict): raise QAPISemError(info, "%s should be an object or type name" % source) diff --git a/tests/qapi-schema/bad-data.err b/tests/qapi-schema/bad-data.err index 7991c88..a987df4 100644 --- a/tests/qapi-schema/bad-data.err +++ b/tests/qapi-schema/bad-data.err @@ -1,2 +1,2 @@ bad-data.json: In command 'oops': -bad-data.json:2: 'data' cannot be an array +bad-data.json:2: 'data' should be an object or type name diff --git a/tests/qapi-schema/union-array-branch.err b/tests/qapi-schema/union-array-branch.err index 5db9c17..2aa1462 100644 --- a/tests/qapi-schema/union-array-branch.err +++ b/tests/qapi-schema/union-array-branch.err @@ -1,2 +1,2 @@ union-array-branch.json: In union 'TestUnion': -union-array-branch.json:8: 'data' member 'value1' cannot be an array +union-array-branch.json:8: 'data' member 'value1' should be a type name |