david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qapi: Simplify check_keys()

Browse Source 
check_keys() parameter expr_elem expects a dictionary with keys 'expr'
and 'info'.  Passing the two values separately is simpler, so do that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190914153506.2151-15-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2019-09-14 17:35:01 +02:00
parent fe9c4dcf90
commit dc234189f8
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/qapi/common.py
View File

@ -1029,9 +1029,7 @@ def check_known_keys(info, source, keys, required, optional):
source, pprint(allowed))) source, pprint(allowed)))
def check_keys(expr_elem, meta, required, optional=[]): def check_keys(expr, info, meta, required, optional=[]):
expr = expr_elem['expr']
info = expr_elem['info']
name = expr[meta] name = expr[meta]
if not isinstance(name, str): if not isinstance(name, str):
raise QAPISemError(info, "'%s' key must have a string value" % meta) raise QAPISemError(info, "'%s' key must have a string value" % meta)
@ -1100,40 +1098,39 @@ def check_exprs(exprs):
if 'enum' in expr: if 'enum' in expr:
meta = 'enum' meta = 'enum'
check_keys(expr_elem, 'enum', ['data'], ['if', 'prefix']) check_keys(expr, info, 'enum', ['data'], ['if', 'prefix'])
normalize_enum(expr) normalize_enum(expr)
enum_types[expr[meta]] = expr enum_types[expr[meta]] = expr
elif 'union' in expr: elif 'union' in expr:
meta = 'union' meta = 'union'
check_keys(expr_elem, 'union', ['data'], check_keys(expr, info, 'union', ['data'],
['base', 'discriminator', 'if']) ['base', 'discriminator', 'if'])
normalize_members(expr.get('base')) normalize_members(expr.get('base'))
normalize_members(expr['data']) normalize_members(expr['data'])
union_types[expr[meta]] = expr union_types[expr[meta]] = expr
elif 'alternate' in expr: elif 'alternate' in expr:
meta = 'alternate' meta = 'alternate'
check_keys(expr_elem, 'alternate', ['data'], ['if']) check_keys(expr, info, 'alternate', ['data'], ['if'])
normalize_members(expr['data']) normalize_members(expr['data'])
elif 'struct' in expr: elif 'struct' in expr:
meta = 'struct' meta = 'struct'
check_keys(expr_elem, 'struct', ['data'], check_keys(expr, info, 'struct', ['data'],
['base', 'if', 'features']) ['base', 'if', 'features'])
normalize_members(expr['data']) normalize_members(expr['data'])
normalize_features(expr.get('features')) normalize_features(expr.get('features'))
struct_types[expr[meta]] = expr struct_types[expr[meta]] = expr
elif 'command' in expr: elif 'command' in expr:
meta = 'command' meta = 'command'
check_keys(expr_elem, 'command', [], check_keys(expr, info, 'command', [],
['data', 'returns', 'gen', 'success-response', ['data', 'returns', 'gen', 'success-response',
'boxed', 'allow-oob', 'allow-preconfig', 'if']) 'boxed', 'allow-oob', 'allow-preconfig', 'if'])
normalize_members(expr.get('data')) normalize_members(expr.get('data'))
elif 'event' in expr: elif 'event' in expr:
meta = 'event' meta = 'event'
check_keys(expr_elem, 'event', [], ['data', 'boxed', 'if']) check_keys(expr, info, 'event', [], ['data', 'boxed', 'if'])
normalize_members(expr.get('data')) normalize_members(expr.get('data'))
else: else:
raise QAPISemError(expr_elem['info'], raise QAPISemError(info, "Expression is missing metatype")
"Expression is missing metatype")
normalize_if(expr) normalize_if(expr)
name = expr[meta] name = expr[meta]
add_name(name, info, meta) add_name(name, info, meta)