From: John Snow Date: Wed, 21 Apr 2021 18:20:24 +0000 (-0400) Subject: qapi/expr.py: Modify check_keys to accept any Collection X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=538cd41065ae5e506a1a07e866b1fd40b4b53d07;p=qemu.git qapi/expr.py: Modify check_keys to accept any Collection This is a minor adjustment that lets parameters @required and @optional take tuple arguments, in particular (). Later patches will make use of that. (Iterable would also have worked, but Iterable also includes things like generator expressions which are consumed upon iteration, which would require a rewrite to make sure that each input was only traversed once. Collection implies the "can re-iterate" property.) Signed-off-by: John Snow Message-Id: <20210421182032.3521476-10-jsnow@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index f3a4a8536e..396c8126d6 100644 --- a/scripts/qapi/expr.py +++ b/scripts/qapi/expr.py @@ -102,7 +102,7 @@ def check_keys(value, info, source, required, optional): "%s misses key%s %s" % (source, 's' if len(missing) > 1 else '', pprint(missing))) - allowed = set(required + optional) + allowed = set(required) | set(optional) unknown = set(value) - allowed if unknown: raise QAPISemError(