diff options
| author | Markus Armbruster | 2019-09-27 15:46:26 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2019-09-28 17:17:19 +0200 |
| commit | 88112488cf228df8b7588c8aa38e16ecd0dff48e (patch) | |
| tree | b6d437c3706dc42ce94ee0b71be7284e980b1b6f | |
| parent | qapi: Move check for reserved names out of add_name() (diff) | |
| download | qemu-88112488cf228df8b7588c8aa38e16ecd0dff48e.tar.gz qemu-88112488cf228df8b7588c8aa38e16ecd0dff48e.tar.xz qemu-88112488cf228df8b7588c8aa38e16ecd0dff48e.zip | |
qapi: Make check_type()'s array case a bit more obvious
check_type() checks the array's contents, then peels off the array and
falls through to the "not array" code without resetting allow_array
and allow_dict to False. Works because the peeled value is a string,
and allow_array and allow_dict aren't used then. Tidy up anyway:
recurse instead, defaulting allow_array and allow_dict to False.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-14-armbru@redhat.com>
| -rw-r--r-- | scripts/qapi/common.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 111a4bbe55..870d8b0ecb 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -795,7 +795,8 @@ def check_type(value, info, source, raise QAPISemError(info, "%s: array type must contain single type name" % source) - value = value[0] + check_type(value[0], info, source, allow_metas=allow_metas) + return # Check if type name for value is okay if isinstance(value, str): |