aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-09-27 15:46:32 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-09-28 17:17:19 +0200
commita6735a574382b214d7f1ee7b315cc81421aaa77e (patch)
treecda103d448f470f8837c20d53029299ebbe37da5 /scripts
parent576f0b8a53ab12d6ca46ec8f89ec0901d80d0ad8 (diff)
downloadqemu-a6735a574382b214d7f1ee7b315cc81421aaa77e.zip
qemu-a6735a574382b214d7f1ee7b315cc81421aaa77e.tar.gz
qemu-a6735a574382b214d7f1ee7b315cc81421aaa77e.tar.bz2
qapi: Improve reporting of invalid flags
Split check_flags() off check_keys() and have check_exprs() call it later, so its error messages gain an "in definition" line. Tweak the error messages. Checking values in a function named check_keys() is unclean anyway. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20190927134639.4284-20-armbru@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi/common.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 8f96974..4f67b73 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -915,16 +915,17 @@ def check_keys(expr, info, meta, required, optional=[]):
required = required + [meta]
source = "%s '%s'" % (meta, name)
check_known_keys(expr, info, source, required, optional)
- for (key, value) in expr.items():
- if key in ['gen', 'success-response'] and value is not False:
- raise QAPISemError(info,
- "'%s' of %s '%s' should only use false value"
- % (key, meta, name))
- if (key in ['boxed', 'allow-oob', 'allow-preconfig']
- and value is not True):
- raise QAPISemError(info,
- "'%s' of %s '%s' should only use true value"
- % (key, meta, name))
+
+
+def check_flags(expr, info):
+ for key in ['gen', 'success-response']:
+ if key in expr and expr[key] is not False:
+ raise QAPISemError(
+ info, "flag '%s' may only use false value" % key)
+ for key in ['boxed', 'allow-oob', 'allow-preconfig']:
+ if key in expr and expr[key] is not True:
+ raise QAPISemError(
+ info, "flag '%s' may only use true value" % key)
def normalize_enum(expr):
@@ -1027,6 +1028,7 @@ def check_exprs(exprs):
assert False, 'unexpected meta type'
check_if(expr, info)
+ check_flags(expr, info)
if doc:
doc.check_expr(expr)