ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi: Change frontend error messages to start with lower case 

Starting error messages with a capital letter complicates things when
text can get interpolated both at the beginning and in the middle of
an error message.  The next patch will do that.  Switch to lower case
to keep it simpler.

For what it's worth, the GNU Coding Standards advise the message
"should not begin with a capital letter when it follows a program name
and/or file name, because that isn’t the beginning of a sentence. (The
sentence conceptually starts at the beginning of the line.)"

While there, avoid breaking lines containing multiple arguments in the
middle of an argument.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-7-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-09-27 15:46:19 +02:00
parent 638c4af931
commit 2ab218aad6
121 changed files with 222 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
scripts/qapi/common.py
View File

@ -207,7 +207,7 @@ class QAPIDoc(object):
return return
if line[0] != ' ': if line[0] != ' ':
raise QAPIParseError(self._parser, "Missing space after #") raise QAPIParseError(self._parser, "missing space after #")
line = line[1:] line = line[1:]
self._append_line(line) self._append_line(line)
@ -241,11 +241,11 @@ class QAPIDoc(object):
# recognized, and get silently treated as ordinary text # recognized, and get silently treated as ordinary text
if not self.symbol and not self.body.text and line.startswith('@'): if not self.symbol and not self.body.text and line.startswith('@'):
if not line.endswith(':'): if not line.endswith(':'):
raise QAPIParseError(self._parser, "Line should end with ':'") raise QAPIParseError(self._parser, "line should end with ':'")
self.symbol = line[1:-1] self.symbol = line[1:-1]
# FIXME invalid names other than the empty string aren't flagged # FIXME invalid names other than the empty string aren't flagged
if not self.symbol: if not self.symbol:
raise QAPIParseError(self._parser, "Invalid name") raise QAPIParseError(self._parser, "invalid name")
elif self.symbol: elif self.symbol:
# This is a definition documentation block # This is a definition documentation block
if name.startswith('@') and name.endswith(':'): if name.startswith('@') and name.endswith(':'):
@ -344,7 +344,7 @@ class QAPIDoc(object):
def _start_symbol_section(self, symbols_dict, name): def _start_symbol_section(self, symbols_dict, name):
# FIXME invalid names other than the empty string aren't flagged # FIXME invalid names other than the empty string aren't flagged
if not name: if not name:
raise QAPIParseError(self._parser, "Invalid parameter name") raise QAPIParseError(self._parser, "invalid parameter name")
if name in symbols_dict: if name in symbols_dict:
raise QAPIParseError(self._parser, raise QAPIParseError(self._parser,
"'%s' parameter name duplicated" % name) "'%s' parameter name duplicated" % name)
@ -362,7 +362,7 @@ class QAPIDoc(object):
def _start_section(self, name=None): def _start_section(self, name=None):
if name in ('Returns', 'Since') and self.has_section(name): if name in ('Returns', 'Since') and self.has_section(name):
raise QAPIParseError(self._parser, raise QAPIParseError(self._parser,
"Duplicated '%s' section" % name) "duplicated '%s' section" % name)
self._end_section() self._end_section()
self._section = QAPIDoc.Section(name) self._section = QAPIDoc.Section(name)
self.sections.append(self._section) self.sections.append(self._section)
@ -371,8 +371,9 @@ class QAPIDoc(object):
if self._section: if self._section:
text = self._section.text = self._section.text.strip() text = self._section.text = self._section.text.strip()
if self._section.name and (not text or text.isspace()): if self._section.name and (not text or text.isspace()):
raise QAPIParseError(self._parser, "Empty doc section '%s'" raise QAPIParseError(
% self._section.name) self._parser,
"empty doc section '%s'" % self._section.name)
self._section = None self._section = None
def _append_freeform(self, line): def _append_freeform(self, line):
@ -400,7 +401,7 @@ class QAPIDoc(object):
if bogus: if bogus:
raise QAPISemError( raise QAPISemError(
self.info, self.info,
"The following documented members are not in " "the following documented members are not in "
"the declaration: %s" % ", ".join(bogus)) "the declaration: %s" % ", ".join(bogus))
@ -432,11 +433,11 @@ class QAPISchemaParser(object):
if 'include' in expr: if 'include' in expr:
self.reject_expr_doc(cur_doc) self.reject_expr_doc(cur_doc)
if len(expr) != 1: if len(expr) != 1:
raise QAPISemError(info, "Invalid 'include' directive") raise QAPISemError(info, "invalid 'include' directive")
include = expr['include'] include = expr['include']
if not isinstance(include, str): if not isinstance(include, str):
raise QAPISemError(info, raise QAPISemError(info,
"Value of 'include' must be a string") "value of 'include' must be a string")
incl_fname = os.path.join(os.path.dirname(self.fname), incl_fname = os.path.join(os.path.dirname(self.fname),
include) include)
self.exprs.append({'expr': {'include': incl_fname}, self.exprs.append({'expr': {'include': incl_fname},
@ -449,11 +450,11 @@ class QAPISchemaParser(object):
elif "pragma" in expr: elif "pragma" in expr:
self.reject_expr_doc(cur_doc) self.reject_expr_doc(cur_doc)
if len(expr) != 1: if len(expr) != 1:
raise QAPISemError(info, "Invalid 'pragma' directive") raise QAPISemError(info, "invalid 'pragma' directive")
pragma = expr['pragma'] pragma = expr['pragma']
if not isinstance(pragma, dict): if not isinstance(pragma, dict):
raise QAPISemError( raise QAPISemError(
info, "Value of 'pragma' must be an object") info, "value of 'pragma' must be an object")
for name, value in pragma.items(): for name, value in pragma.items():
self._pragma(name, value, info) self._pragma(name, value, info)
else: else:
@ -462,7 +463,7 @@ class QAPISchemaParser(object):
if cur_doc: if cur_doc:
if not cur_doc.symbol: if not cur_doc.symbol:
raise QAPISemError( raise QAPISemError(
cur_doc.info, "Definition documentation required") cur_doc.info, "definition documentation required")
expr_elem['doc'] = cur_doc expr_elem['doc'] = cur_doc
self.exprs.append(expr_elem) self.exprs.append(expr_elem)
cur_doc = None cur_doc = None
@ -473,7 +474,7 @@ class QAPISchemaParser(object):
if doc and doc.symbol: if doc and doc.symbol:
raise QAPISemError( raise QAPISemError(
doc.info, doc.info,
"Documentation for '%s' is not followed by the definition" "documentation for '%s' is not followed by the definition"
% doc.symbol) % doc.symbol)
def _include(self, include, info, incl_fname, previously_included): def _include(self, include, info, incl_fname, previously_included):
@ -482,7 +483,7 @@ class QAPISchemaParser(object):
inf = info inf = info
while inf: while inf:
if incl_abs_fname == os.path.abspath(inf.fname): if incl_abs_fname == os.path.abspath(inf.fname):
raise QAPISemError(info, "Inclusion loop for %s" % include) raise QAPISemError(info, "inclusion loop for %s" % include)
inf = inf.parent inf = inf.parent
# skip multiple include of the same file # skip multiple include of the same file
@ -503,24 +504,24 @@ class QAPISchemaParser(object):
if name == 'doc-required': if name == 'doc-required':
if not isinstance(value, bool): if not isinstance(value, bool):
raise QAPISemError(info, raise QAPISemError(info,
"Pragma 'doc-required' must be boolean") "pragma 'doc-required' must be boolean")
doc_required = value doc_required = value
elif name == 'returns-whitelist': elif name == 'returns-whitelist':
if (not isinstance(value, list) if (not isinstance(value, list)
or any([not isinstance(elt, str) for elt in value])): or any([not isinstance(elt, str) for elt in value])):
raise QAPISemError(info, raise QAPISemError(
"Pragma returns-whitelist must be" info,
" a list of strings") "pragma returns-whitelist must be a list of strings")
returns_whitelist = value returns_whitelist = value
elif name == 'name-case-whitelist': elif name == 'name-case-whitelist':
if (not isinstance(value, list) if (not isinstance(value, list)
or any([not isinstance(elt, str) for elt in value])): or any([not isinstance(elt, str) for elt in value])):
raise QAPISemError(info, raise QAPISemError(
"Pragma name-case-whitelist must be" info,
" a list of strings") "pragma name-case-whitelist must be a list of strings")
name_case_whitelist = value name_case_whitelist = value
else: else:
raise QAPISemError(info, "Unknown pragma '%s'" % name) raise QAPISemError(info, "unknown pragma '%s'" % name)
def accept(self, skip_comment=True): def accept(self, skip_comment=True):
while True: while True:
@ -547,13 +548,13 @@ class QAPISchemaParser(object):
ch = self.src[self.cursor] ch = self.src[self.cursor]
self.cursor += 1 self.cursor += 1
if ch == '\n': if ch == '\n':
raise QAPIParseError(self, "Missing terminating \"'\"") raise QAPIParseError(self, "missing terminating \"'\"")
if esc: if esc:
# Note: we recognize only \\ because we have # Note: we recognize only \\ because we have
# no use for funny characters in strings # no use for funny characters in strings
if ch != '\\': if ch != '\\':
raise QAPIParseError(self, raise QAPIParseError(self,
"Unknown escape \\%s" % ch) "unknown escape \\%s" % ch)
esc = False esc = False
elif ch == '\\': elif ch == '\\':
esc = True esc = True
@ -563,7 +564,7 @@ class QAPISchemaParser(object):
return return
if ord(ch) < 32 or ord(ch) >= 127: if ord(ch) < 32 or ord(ch) >= 127:
raise QAPIParseError( raise QAPIParseError(
self, "Funny character in string") self, "funny character in string")
string += ch string += ch
elif self.src.startswith('true', self.pos): elif self.src.startswith('true', self.pos):
self.val = True self.val = True
@ -584,7 +585,7 @@ class QAPISchemaParser(object):
# character # character
match = re.match('[^[\\]{}:,\\s\'"]+', match = re.match('[^[\\]{}:,\\s\'"]+',
self.src[self.cursor-1:]) self.src[self.cursor-1:])
raise QAPIParseError(self, "Stray '%s'" % match.group(0)) raise QAPIParseError(self, "stray '%s'" % match.group(0))
def get_members(self): def get_members(self):
expr = OrderedDict() expr = OrderedDict()
@ -592,24 +593,24 @@ class QAPISchemaParser(object):
self.accept() self.accept()
return expr return expr
if self.tok != "'": if self.tok != "'":
raise QAPIParseError(self, "Expected string or '}'") raise QAPIParseError(self, "expected string or '}'")
while True: while True:
key = self.val key = self.val
self.accept() self.accept()
if self.tok != ':': if self.tok != ':':
raise QAPIParseError(self, "Expected ':'") raise QAPIParseError(self, "expected ':'")
self.accept() self.accept()
if key in expr: if key in expr:
raise QAPIParseError(self, "Duplicate key '%s'" % key) raise QAPIParseError(self, "duplicate key '%s'" % key)
expr[key] = self.get_expr(True) expr[key] = self.get_expr(True)
if self.tok == '}': if self.tok == '}':
self.accept() self.accept()
return expr return expr
if self.tok != ',': if self.tok != ',':
raise QAPIParseError(self, "Expected ',' or '}'") raise QAPIParseError(self, "expected ',' or '}'")
self.accept() self.accept()
if self.tok != "'": if self.tok != "'":
raise QAPIParseError(self, "Expected string") raise QAPIParseError(self, "expected string")
def get_values(self): def get_values(self):
expr = [] expr = []
@ -618,19 +619,19 @@ class QAPISchemaParser(object):
return expr return expr
if self.tok not in "{['tfn": if self.tok not in "{['tfn":
raise QAPIParseError( raise QAPIParseError(
self, "Expected '{', '[', ']', string, boolean or 'null'") self, "expected '{', '[', ']', string, boolean or 'null'")
while True: while True:
expr.append(self.get_expr(True)) expr.append(self.get_expr(True))
if self.tok == ']': if self.tok == ']':
self.accept() self.accept()
return expr return expr
if self.tok != ',': if self.tok != ',':
raise QAPIParseError(self, "Expected ',' or ']'") raise QAPIParseError(self, "expected ',' or ']'")
self.accept() self.accept()
def get_expr(self, nested): def get_expr(self, nested):
if self.tok != '{' and not nested: if self.tok != '{' and not nested:
raise QAPIParseError(self, "Expected '{'") raise QAPIParseError(self, "expected '{'")
if self.tok == '{': if self.tok == '{':
self.accept() self.accept()
expr = self.get_members() expr = self.get_members()
@ -642,13 +643,13 @@ class QAPISchemaParser(object):
self.accept() self.accept()
else: else:
raise QAPIParseError( raise QAPIParseError(
self, "Expected '{', '[', string, boolean or 'null'") self, "expected '{', '[', string, boolean or 'null'")
return expr return expr
def get_doc(self, info): def get_doc(self, info):
if self.val != '##': if self.val != '##':
raise QAPIParseError(self, "Junk after '##' at start of " raise QAPIParseError(
"documentation comment") self, "junk after '##' at start of documentation comment")
doc = QAPIDoc(self, info) doc = QAPIDoc(self, info)
self.accept(False) self.accept(False)
@ -656,8 +657,9 @@ class QAPISchemaParser(object):
if self.val.startswith('##'): if self.val.startswith('##'):
# End of doc comment # End of doc comment
if self.val != '##': if self.val != '##':
raise QAPIParseError(self, "Junk after '##' at end of " raise QAPIParseError(
"documentation comment") self,
"junk after '##' at end of documentation comment")
doc.end_comment() doc.end_comment()
self.accept() self.accept()
return doc return doc
@ -665,7 +667,7 @@ class QAPISchemaParser(object):
doc.append(self.val) doc.append(self.val)
self.accept(False) self.accept(False)
raise QAPIParseError(self, "Documentation comment must end with '##'") raise QAPIParseError(self, "documentation comment must end with '##'")
# #
@ -804,18 +806,18 @@ def check_type(info, source, value,
# value is a dictionary, check that each member is okay # value is a dictionary, check that each member is okay
for (key, arg) in value.items(): for (key, arg) in value.items():
check_name(info, "Member of %s" % source, key, check_name(info, "member of %s" % source, key,
allow_optional=True, permit_upper=permit_upper) allow_optional=True, permit_upper=permit_upper)
if c_name(key, False) == 'u' or c_name(key, False).startswith('has_'): if c_name(key, False) == 'u' or c_name(key, False).startswith('has_'):
raise QAPISemError(info, "Member of %s uses reserved name '%s'" raise QAPISemError(
% (source, key)) info, "member of %s uses reserved name '%s'" % (source, key))
# Todo: allow dictionaries to represent default values of # Todo: allow dictionaries to represent default values of
# an optional argument. # an optional argument.
check_known_keys(info, "member '%s' of %s" % (key, source), check_known_keys(info, "member '%s' of %s" % (key, source),
arg, ['type'], ['if']) arg, ['type'], ['if'])
check_if(arg, info) check_if(arg, info)
normalize_if(arg) normalize_if(arg)
check_type(info, "Member '%s' of %s" % (key, source), check_type(info, "member '%s' of %s" % (key, source),
arg['type'], allow_array=True, arg['type'], allow_array=True,
allow_metas=['built-in', 'union', 'alternate', 'struct', allow_metas=['built-in', 'union', 'alternate', 'struct',
'enum']) 'enum'])
@ -868,8 +870,8 @@ def check_union(expr, info):
enum_values = members.keys() enum_values = members.keys()
allow_metas = ['built-in', 'union', 'alternate', 'struct', 'enum'] allow_metas = ['built-in', 'union', 'alternate', 'struct', 'enum']
if base is not None: if base is not None:
raise QAPISemError(info, "Simple union '%s' must not have a base" % raise QAPISemError(
name) info, "simple union '%s' must not have a base" % name)
# Else, it's a flat union. # Else, it's a flat union.
else: else:
@ -878,46 +880,47 @@ def check_union(expr, info):
base, allow_dict=name, base, allow_dict=name,
allow_metas=['struct']) allow_metas=['struct'])
if not base: if not base:
raise QAPISemError(info, "Flat union '%s' must have a base" raise QAPISemError(
% name) info, "flat union '%s' must have a base" % name)
base_members = find_base_members(base) base_members = find_base_members(base)
assert base_members is not None assert base_members is not None
# The value of member 'discriminator' must name a non-optional # The value of member 'discriminator' must name a non-optional
# member of the base struct. # member of the base struct.
check_name(info, "Discriminator of flat union '%s'" % name, check_name(info, "discriminator of flat union '%s'" % name,
discriminator) discriminator)
discriminator_value = base_members.get(discriminator) discriminator_value = base_members.get(discriminator)
if not discriminator_value: if not discriminator_value:
raise QAPISemError(info, raise QAPISemError(info,
"Discriminator '%s' is not a member of 'base'" "discriminator '%s' is not a member of 'base'"
% discriminator) % discriminator)
if discriminator_value.get('if'): if discriminator_value.get('if'):
raise QAPISemError( raise QAPISemError(
info, info,
"The discriminator '%s' for union %s must not be conditional" "the discriminator '%s' for union %s must not be conditional"
% (discriminator, name)) % (discriminator, name))
enum_define = enum_types.get(discriminator_value['type']) enum_define = enum_types.get(discriminator_value['type'])
# Do not allow string discriminator # Do not allow string discriminator
if not enum_define: if not enum_define:
raise QAPISemError(info, raise QAPISemError(
"Discriminator '%s' must be of enumeration " info,
"type" % discriminator) "discriminator '%s' must be of enumeration type"
% discriminator)
enum_values = enum_get_names(enum_define) enum_values = enum_get_names(enum_define)
allow_metas = ['struct'] allow_metas = ['struct']
if (len(enum_values) == 0): if (len(enum_values) == 0):
raise QAPISemError(info, "Union '%s' has no branches" % name) raise QAPISemError(info, "union '%s' has no branches" % name)
for (key, value) in members.items(): for (key, value) in members.items():
check_name(info, "Member of union '%s'" % name, key) check_name(info, "member of union '%s'" % name, key)
check_known_keys(info, "member '%s' of union '%s'" % (key, name), check_known_keys(info, "member '%s' of union '%s'" % (key, name),
value, ['type'], ['if']) value, ['type'], ['if'])
check_if(value, info) check_if(value, info)
normalize_if(value) normalize_if(value)
# Each value must name a known type # Each value must name a known type
check_type(info, "Member '%s' of union '%s'" % (key, name), check_type(info, "member '%s' of union '%s'" % (key, name),
value['type'], value['type'],
allow_array=not base, allow_metas=allow_metas) allow_array=not base, allow_metas=allow_metas)
@ -925,10 +928,10 @@ def check_union(expr, info):
# of 'data' must also be members of the enum type. # of 'data' must also be members of the enum type.
if discriminator is not None: if discriminator is not None:
if key not in enum_values: if key not in enum_values:
raise QAPISemError(info, raise QAPISemError(
"Discriminator value '%s' is not found in " info,
"enum '%s'" "discriminator value '%s' is not found in enum '%s'"
% (key, enum_define['enum'])) % (key, enum_define['enum']))
def check_alternate(expr, info): def check_alternate(expr, info):
@ -938,9 +941,9 @@ def check_alternate(expr, info):
if len(members) == 0: if len(members) == 0:
raise QAPISemError(info, raise QAPISemError(info,
"Alternate '%s' cannot have empty 'data'" % name) "alternate '%s' cannot have empty 'data'" % name)
for (key, value) in members.items(): for (key, value) in members.items():
check_name(info, "Member of alternate '%s'" % name, key) check_name(info, "member of alternate '%s'" % name, key)
check_known_keys(info, check_known_keys(info,
"member '%s' of alternate '%s'" % (key, name), "member '%s' of alternate '%s'" % (key, name),
value, ['type'], ['if']) value, ['type'], ['if'])
@ -949,12 +952,14 @@ def check_alternate(expr, info):
typ = value['type'] typ = value['type']
# Ensure alternates have no type conflicts. # Ensure alternates have no type conflicts.
check_type(info, "Member '%s' of alternate '%s'" % (key, name), typ, check_type(info, "member '%s' of alternate '%s'" % (key, name), typ,
allow_metas=['built-in', 'union', 'struct', 'enum']) allow_metas=['built-in', 'union', 'struct', 'enum'])
qtype = find_alternate_member_qtype(typ) qtype = find_alternate_member_qtype(typ)
if not qtype: if not qtype:
raise QAPISemError(info, "Alternate '%s' member '%s' cannot use " raise QAPISemError(
"type '%s'" % (name, key, typ)) info,
"alternate '%s' member '%s' cannot use type '%s'"
% (name, key, typ))
conflicting = set([qtype]) conflicting = set([qtype])
if qtype == 'QTYPE_QSTRING': if qtype == 'QTYPE_QSTRING':
enum_expr = enum_types.get(typ) enum_expr = enum_types.get(typ)
@ -969,9 +974,11 @@ def check_alternate(expr, info):
conflicting.add('QTYPE_QBOOL') conflicting.add('QTYPE_QBOOL')
for qt in conflicting: for qt in conflicting:
if qt in types_seen: if qt in types_seen:
raise QAPISemError(info, "Alternate '%s' member '%s' can't " raise QAPISemError(
"be distinguished from member '%s'" info,
% (name, key, types_seen[qt])) "alternate '%s' member '%s' can't be distinguished "
"from member '%s'"
% (name, key, types_seen[qt]))
types_seen[qt] = key types_seen[qt] = key
@ -982,10 +989,10 @@ def check_enum(expr, info):
if not isinstance(members, list): if not isinstance(members, list):
raise QAPISemError(info, raise QAPISemError(info,
"Enum '%s' requires an array for 'data'" % name) "enum '%s' requires an array for 'data'" % name)
if prefix is not None and not isinstance(prefix, str): if prefix is not None and not isinstance(prefix, str):
raise QAPISemError(info, raise QAPISemError(info,
"Enum '%s' requires a string for 'prefix'" % name) "enum '%s' requires a string for 'prefix'" % name)
permit_upper = name in name_case_whitelist permit_upper = name in name_case_whitelist
@ -994,7 +1001,7 @@ def check_enum(expr, info):
['name'], ['if']) ['name'], ['if'])
check_if(member, info) check_if(member, info)
normalize_if(member) normalize_if(member)
check_name(info, "Member of enum '%s'" % name, member['name'], check_name(info, "member of enum '%s'" % name, member['name'],
enum_member=True, permit_upper=permit_upper) enum_member=True, permit_upper=permit_upper)
@ -1010,9 +1017,8 @@ def check_struct(expr, info):
if features: if features:
if not isinstance(features, list): if not isinstance(features, list):
raise QAPISemError(info, raise QAPISemError(
"Struct '%s' requires an array for 'features'" % info, "struct '%s' requires an array for 'features'" % name)
name)
for f in features: for f in features:
assert isinstance(f, dict) assert isinstance(f, dict)
check_known_keys(info, "feature of struct %s" % name, f, check_known_keys(info, "feature of struct %s" % name, f,
@ -1020,7 +1026,7 @@ def check_struct(expr, info):
check_if(f, info) check_if(f, info)
normalize_if(f) normalize_if(f)
check_name(info, "Feature of struct %s" % name, f['name']) check_name(info, "feature of struct %s" % name, f['name'])
def check_known_keys(info, source, value, required, optional): def check_known_keys(info, source, value, required, optional):
@ -1030,15 +1036,19 @@ def check_known_keys(info, source, value, required, optional):
missing = set(required) - set(value) missing = set(required) - set(value)
if missing: if missing:
raise QAPISemError(info, "Key%s %s %s missing from %s" raise QAPISemError(
% ('s' if len(missing) > 1 else '', pprint(missing), info,
'are' if len(missing) > 1 else 'is', source)) "key%s %s %s missing from %s"
% ('s' if len(missing) > 1 else '', pprint(missing),
'are' if len(missing) > 1 else 'is', source))
allowed = set(required + optional) allowed = set(required + optional)
unknown = set(value) - allowed unknown = set(value) - allowed
if unknown: if unknown:
raise QAPISemError(info, "Unknown key%s %s in %s\nValid keys are %s." raise QAPISemError(
% ('s' if len(unknown) > 1 else '', pprint(unknown), info,
source, pprint(allowed))) "unknown key%s %s in %s\nValid keys are %s."
% ('s' if len(unknown) > 1 else '', pprint(unknown),
source, pprint(allowed)))
def check_keys(expr, info, meta, required, optional=[]): def check_keys(expr, info, meta, required, optional=[]):
@ -1106,7 +1116,7 @@ def check_exprs(exprs):
if not doc and doc_required: if not doc and doc_required:
raise QAPISemError(info, raise QAPISemError(info,
"Definition missing documentation comment") "definition missing documentation comment")
if 'enum' in expr: if 'enum' in expr:
meta = 'enum' meta = 'enum'
@ -1142,14 +1152,16 @@ def check_exprs(exprs):
check_keys(expr, info, '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(info, "Expression is missing metatype") raise QAPISemError(info, "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)
info.set_defn(meta, name) info.set_defn(meta, name)
if doc and doc.symbol != name: if doc and doc.symbol != name:
raise QAPISemError(info, "Definition of '%s' follows documentation" raise QAPISemError(
" for '%s'" % (name, doc.symbol)) info,
"definition of '%s' follows documentation for '%s'"
% (name, doc.symbol))
# Validate that exprs make sense # Validate that exprs make sense
for expr_elem in exprs: for expr_elem in exprs:
@ -1462,7 +1474,7 @@ class QAPISchemaObjectType(QAPISchemaType):
if self._checked: if self._checked:
# Recursed: C struct contains itself # Recursed: C struct contains itself
raise QAPISemError(self.info, raise QAPISemError(self.info,
"Object %s contains itself" % self.name) "object %s contains itself" % self.name)
QAPISchemaType.check(self, schema) QAPISchemaType.check(self, schema)
assert self._checked and self.members is None assert self._checked and self.members is None
@ -1734,7 +1746,7 @@ class QAPISchemaCommand(QAPISchemaEntity):
assert isinstance(self.arg_type, QAPISchemaObjectType) assert isinstance(self.arg_type, QAPISchemaObjectType)
assert not self.arg_type.variants or self.boxed assert not self.arg_type.variants or self.boxed
elif self.boxed: elif self.boxed:
raise QAPISemError(self.info, "Use of 'boxed' requires 'data'") raise QAPISemError(self.info, "use of 'boxed' requires 'data'")
if self._ret_type_name: if self._ret_type_name:
self.ret_type = schema.lookup_type(self._ret_type_name) self.ret_type = schema.lookup_type(self._ret_type_name)
assert isinstance(self.ret_type, QAPISchemaType) assert isinstance(self.ret_type, QAPISchemaType)
@ -1763,7 +1775,7 @@ class QAPISchemaEvent(QAPISchemaEntity):
assert isinstance(self.arg_type, QAPISchemaObjectType) assert isinstance(self.arg_type, QAPISchemaObjectType)
assert not self.arg_type.variants or self.boxed assert not self.arg_type.variants or self.boxed
elif self.boxed: elif self.boxed:
raise QAPISemError(self.info, "Use of 'boxed' requires 'data'") raise QAPISemError(self.info, "use of 'boxed' requires 'data'")
def visit(self, visitor): def visit(self, visitor):
QAPISchemaEntity.visit(self, visitor) QAPISchemaEntity.visit(self, visitor)

2
tests/qapi-schema/alternate-any.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-any.json: In alternate 'Alt': tests/qapi-schema/alternate-any.json: In alternate 'Alt':
tests/qapi-schema/alternate-any.json:2: Alternate 'Alt' member 'one' cannot use type 'any' tests/qapi-schema/alternate-any.json:2: alternate 'Alt' member 'one' cannot use type 'any'

2
tests/qapi-schema/alternate-array.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-array.json: In alternate 'Alt': tests/qapi-schema/alternate-array.json: In alternate 'Alt':
tests/qapi-schema/alternate-array.json:5: Member 'two' of alternate 'Alt' cannot be an array tests/qapi-schema/alternate-array.json:5: member 'two' of alternate 'Alt' cannot be an array

2
tests/qapi-schema/alternate-base.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-base.json:4: Unknown key 'base' in alternate 'Alt' tests/qapi-schema/alternate-base.json:4: unknown key 'base' in alternate 'Alt'
Valid keys are 'alternate', 'data', 'if'. Valid keys are 'alternate', 'data', 'if'.

2
tests/qapi-schema/alternate-conflict-bool-string.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-bool-string.json: In alternate 'Alt': tests/qapi-schema/alternate-conflict-bool-string.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-bool-string.json:2: Alternate 'Alt' member 'two' can't be distinguished from member 'one' tests/qapi-schema/alternate-conflict-bool-string.json:2: alternate 'Alt' member 'two' can't be distinguished from member 'one'

2
tests/qapi-schema/alternate-conflict-dict.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-dict.json: In alternate 'Alt': tests/qapi-schema/alternate-conflict-dict.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-dict.json:6: Alternate 'Alt' member 'two' can't be distinguished from member 'one' tests/qapi-schema/alternate-conflict-dict.json:6: alternate 'Alt' member 'two' can't be distinguished from member 'one'

2
tests/qapi-schema/alternate-conflict-enum-bool.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-enum-bool.json: In alternate 'Alt': tests/qapi-schema/alternate-conflict-enum-bool.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-enum-bool.json:4: Alternate 'Alt' member 'two' can't be distinguished from member 'one' tests/qapi-schema/alternate-conflict-enum-bool.json:4: alternate 'Alt' member 'two' can't be distinguished from member 'one'

2
tests/qapi-schema/alternate-conflict-enum-int.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-enum-int.json: In alternate 'Alt': tests/qapi-schema/alternate-conflict-enum-int.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-enum-int.json:4: Alternate 'Alt' member 'two' can't be distinguished from member 'one' tests/qapi-schema/alternate-conflict-enum-int.json:4: alternate 'Alt' member 'two' can't be distinguished from member 'one'

2
tests/qapi-schema/alternate-conflict-num-string.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-num-string.json: In alternate 'Alt': tests/qapi-schema/alternate-conflict-num-string.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-num-string.json:2: Alternate 'Alt' member 'two' can't be distinguished from member 'one' tests/qapi-schema/alternate-conflict-num-string.json:2: alternate 'Alt' member 'two' can't be distinguished from member 'one'

2
tests/qapi-schema/alternate-conflict-string.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-conflict-string.json: In alternate 'Alt': tests/qapi-schema/alternate-conflict-string.json: In alternate 'Alt':
tests/qapi-schema/alternate-conflict-string.json:2: Alternate 'Alt' member 'two' can't be distinguished from member 'one' tests/qapi-schema/alternate-conflict-string.json:2: alternate 'Alt' member 'two' can't be distinguished from member 'one'

2
tests/qapi-schema/alternate-empty.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-empty.json: In alternate 'Alt': tests/qapi-schema/alternate-empty.json: In alternate 'Alt':
tests/qapi-schema/alternate-empty.json:2: Alternate 'Alt' cannot have empty 'data' tests/qapi-schema/alternate-empty.json:2: alternate 'Alt' cannot have empty 'data'

2
tests/qapi-schema/alternate-invalid-dict.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-invalid-dict.json: In alternate 'Alt': tests/qapi-schema/alternate-invalid-dict.json: In alternate 'Alt':
tests/qapi-schema/alternate-invalid-dict.json:2: Key 'type' is missing from member 'two' of alternate 'Alt' tests/qapi-schema/alternate-invalid-dict.json:2: key 'type' is missing from member 'two' of alternate 'Alt'

2
tests/qapi-schema/alternate-nested.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-nested.json: In alternate 'Alt2': tests/qapi-schema/alternate-nested.json: In alternate 'Alt2':
tests/qapi-schema/alternate-nested.json:4: Member 'nested' of alternate 'Alt2' cannot use alternate type 'Alt1' tests/qapi-schema/alternate-nested.json:4: member 'nested' of alternate 'Alt2' cannot use alternate type 'Alt1'

2
tests/qapi-schema/alternate-unknown.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/alternate-unknown.json: In alternate 'Alt': tests/qapi-schema/alternate-unknown.json: In alternate 'Alt':
tests/qapi-schema/alternate-unknown.json:2: Member 'unknown' of alternate 'Alt' uses unknown type 'MissingType' tests/qapi-schema/alternate-unknown.json:2: member 'unknown' of alternate 'Alt' uses unknown type 'MissingType'

2
tests/qapi-schema/args-array-empty.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/args-array-empty.json: In command 'oops': tests/qapi-schema/args-array-empty.json: In command 'oops':
tests/qapi-schema/args-array-empty.json:2: Member 'empty' of 'data' for command 'oops': array type must contain single type name tests/qapi-schema/args-array-empty.json:2: member 'empty' of 'data' for command 'oops': array type must contain single type name

2
tests/qapi-schema/args-array-unknown.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/args-array-unknown.json: In command 'oops': tests/qapi-schema/args-array-unknown.json: In command 'oops':
tests/qapi-schema/args-array-unknown.json:2: Member 'array' of 'data' for command 'oops' uses unknown type 'NoSuchType' tests/qapi-schema/args-array-unknown.json:2: member 'array' of 'data' for command 'oops' uses unknown type 'NoSuchType'

2
tests/qapi-schema/args-member-array-bad.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/args-member-array-bad.json: In command 'oops': tests/qapi-schema/args-member-array-bad.json: In command 'oops':
tests/qapi-schema/args-member-array-bad.json:2: Member 'member' of 'data' for command 'oops': array type must contain single type name tests/qapi-schema/args-member-array-bad.json:2: member 'member' of 'data' for command 'oops': array type must contain single type name

2
tests/qapi-schema/args-member-case.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/args-member-case.json: In command 'no-way-this-will-get-whitelisted': tests/qapi-schema/args-member-case.json: In command 'no-way-this-will-get-whitelisted':
tests/qapi-schema/args-member-case.json:2: Member of 'data' for command 'no-way-this-will-get-whitelisted' uses uppercase in name 'Arg' tests/qapi-schema/args-member-case.json:2: member of 'data' for command 'no-way-this-will-get-whitelisted' uses uppercase in name 'Arg'

2
tests/qapi-schema/args-member-unknown.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/args-member-unknown.json: In command 'oops': tests/qapi-schema/args-member-unknown.json: In command 'oops':
tests/qapi-schema/args-member-unknown.json:2: Member 'member' of 'data' for command 'oops' uses unknown type 'NoSuchType' tests/qapi-schema/args-member-unknown.json:2: member 'member' of 'data' for command 'oops' uses unknown type 'NoSuchType'

2
tests/qapi-schema/bad-type-int.err
View File

@ -1 +1 @@
tests/qapi-schema/bad-type-int.json:3:13: Stray '123' tests/qapi-schema/bad-type-int.json:3:13: stray '123'

2
tests/qapi-schema/base-cycle-direct.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/base-cycle-direct.json: In struct 'Loopy': tests/qapi-schema/base-cycle-direct.json: In struct 'Loopy':
tests/qapi-schema/base-cycle-direct.json:2: Object Loopy contains itself tests/qapi-schema/base-cycle-direct.json:2: object Loopy contains itself

2
tests/qapi-schema/base-cycle-indirect.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/base-cycle-indirect.json: In struct 'Base1': tests/qapi-schema/base-cycle-indirect.json: In struct 'Base1':
tests/qapi-schema/base-cycle-indirect.json:2: Object Base1 contains itself tests/qapi-schema/base-cycle-indirect.json:2: object Base1 contains itself

2
tests/qapi-schema/doc-bad-alternate-member.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-bad-alternate-member.json:3: The following documented members are not in the declaration: aa, bb tests/qapi-schema/doc-bad-alternate-member.json:3: the following documented members are not in the declaration: aa, bb

2
tests/qapi-schema/doc-bad-command-arg.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-bad-command-arg.json:3: The following documented members are not in the declaration: b tests/qapi-schema/doc-bad-command-arg.json:3: the following documented members are not in the declaration: b

2
tests/qapi-schema/doc-bad-symbol.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/doc-bad-symbol.json: In command 'foo': tests/qapi-schema/doc-bad-symbol.json: In command 'foo':
tests/qapi-schema/doc-bad-symbol.json:6: Definition of 'foo' follows documentation for 'food' tests/qapi-schema/doc-bad-symbol.json:6: definition of 'foo' follows documentation for 'food'

2
tests/qapi-schema/doc-bad-union-member.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-bad-union-member.json:3: The following documented members are not in the declaration: a, b tests/qapi-schema/doc-bad-union-member.json:3: the following documented members are not in the declaration: a, b

2
tests/qapi-schema/doc-before-include.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-before-include.json:3: Documentation for 'foo' is not followed by the definition tests/qapi-schema/doc-before-include.json:3: documentation for 'foo' is not followed by the definition

2
tests/qapi-schema/doc-before-pragma.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-before-pragma.json:3: Documentation for 'foo' is not followed by the definition tests/qapi-schema/doc-before-pragma.json:3: documentation for 'foo' is not followed by the definition

2
tests/qapi-schema/doc-duplicated-return.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-duplicated-return.json:7:1: Duplicated 'Returns' section tests/qapi-schema/doc-duplicated-return.json:7:1: duplicated 'Returns' section

2
tests/qapi-schema/doc-duplicated-since.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-duplicated-since.json:7:1: Duplicated 'Since' section tests/qapi-schema/doc-duplicated-since.json:7:1: duplicated 'Since' section

2
tests/qapi-schema/doc-empty-arg.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-empty-arg.json:5:1: Invalid parameter name tests/qapi-schema/doc-empty-arg.json:5:1: invalid parameter name

2
tests/qapi-schema/doc-empty-section.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-empty-section.json:7:1: Empty doc section 'Note' tests/qapi-schema/doc-empty-section.json:7:1: empty doc section 'Note'

2
tests/qapi-schema/doc-empty-symbol.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-empty-symbol.json:4:1: Invalid name tests/qapi-schema/doc-empty-symbol.json:4:1: invalid name

2
tests/qapi-schema/doc-invalid-end.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-invalid-end.json:5:2: Documentation comment must end with '##' tests/qapi-schema/doc-invalid-end.json:5:2: documentation comment must end with '##'

2
tests/qapi-schema/doc-invalid-end2.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-invalid-end2.json:5:1: Junk after '##' at end of documentation comment tests/qapi-schema/doc-invalid-end2.json:5:1: junk after '##' at end of documentation comment

2
tests/qapi-schema/doc-invalid-start.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-invalid-start.json:3:1: Junk after '##' at start of documentation comment tests/qapi-schema/doc-invalid-start.json:3:1: junk after '##' at start of documentation comment

2
tests/qapi-schema/doc-missing-colon.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-missing-colon.json:4:1: Line should end with ':' tests/qapi-schema/doc-missing-colon.json:4:1: line should end with ':'

2
tests/qapi-schema/doc-missing-expr.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-missing-expr.json:3: Documentation for 'bar' is not followed by the definition tests/qapi-schema/doc-missing-expr.json:3: documentation for 'bar' is not followed by the definition

2
tests/qapi-schema/doc-missing-space.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-missing-space.json:5:1: Missing space after # tests/qapi-schema/doc-missing-space.json:5:1: missing space after #

2
tests/qapi-schema/doc-missing.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-missing.json:5: Definition missing documentation comment tests/qapi-schema/doc-missing.json:5: definition missing documentation comment

2
tests/qapi-schema/doc-no-symbol.err
View File

@ -1 +1 @@
tests/qapi-schema/doc-no-symbol.json:3: Definition documentation required tests/qapi-schema/doc-no-symbol.json:3: definition documentation required

2
tests/qapi-schema/double-type.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/double-type.json:2: Unknown key 'command' in struct 'bar' tests/qapi-schema/double-type.json:2: unknown key 'command' in struct 'bar'
Valid keys are 'base', 'data', 'features', 'if', 'struct'. Valid keys are 'base', 'data', 'features', 'if', 'struct'.

2
tests/qapi-schema/duplicate-key.err
View File

@ -1 +1 @@
tests/qapi-schema/duplicate-key.json:3:10: Duplicate key 'key' tests/qapi-schema/duplicate-key.json:3:10: duplicate key 'key'

2
tests/qapi-schema/enum-bad-member.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/enum-bad-member.json: In enum 'MyEnum': tests/qapi-schema/enum-bad-member.json: In enum 'MyEnum':
tests/qapi-schema/enum-bad-member.json:2: Member of enum 'MyEnum' requires a string name tests/qapi-schema/enum-bad-member.json:2: member of enum 'MyEnum' requires a string name

2
tests/qapi-schema/enum-bad-name.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/enum-bad-name.json: In enum 'MyEnum': tests/qapi-schema/enum-bad-name.json: In enum 'MyEnum':
tests/qapi-schema/enum-bad-name.json:3: Member of enum 'MyEnum' uses invalid name 'not\possible' tests/qapi-schema/enum-bad-name.json:3: member of enum 'MyEnum' uses invalid name 'not\possible'

2
tests/qapi-schema/enum-bad-prefix.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/enum-bad-prefix.json: In enum 'MyEnum': tests/qapi-schema/enum-bad-prefix.json: In enum 'MyEnum':
tests/qapi-schema/enum-bad-prefix.json:2: Enum 'MyEnum' requires a string for 'prefix' tests/qapi-schema/enum-bad-prefix.json:2: enum 'MyEnum' requires a string for 'prefix'

2
tests/qapi-schema/enum-dict-member-unknown.err
View File

@ -1,3 +1,3 @@
tests/qapi-schema/enum-dict-member-unknown.json: In enum 'MyEnum': tests/qapi-schema/enum-dict-member-unknown.json: In enum 'MyEnum':
tests/qapi-schema/enum-dict-member-unknown.json:2: Unknown key 'bad-key' in member of enum 'MyEnum' tests/qapi-schema/enum-dict-member-unknown.json:2: unknown key 'bad-key' in member of enum 'MyEnum'
Valid keys are 'if', 'name'. Valid keys are 'if', 'name'.

2
tests/qapi-schema/enum-int-member.err
View File

@ -1 +1 @@
tests/qapi-schema/enum-int-member.json:3:31: Stray '1' tests/qapi-schema/enum-int-member.json:3:31: stray '1'

2
tests/qapi-schema/enum-member-case.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/enum-member-case.json: In enum 'NoWayThisWillGetWhitelisted': tests/qapi-schema/enum-member-case.json: In enum 'NoWayThisWillGetWhitelisted':
tests/qapi-schema/enum-member-case.json:4: Member of enum 'NoWayThisWillGetWhitelisted' uses uppercase in name 'Value' tests/qapi-schema/enum-member-case.json:4: member of enum 'NoWayThisWillGetWhitelisted' uses uppercase in name 'Value'

2
tests/qapi-schema/enum-missing-data.err
View File

@ -1 +1 @@
tests/qapi-schema/enum-missing-data.json:2: Key 'data' is missing from enum 'MyEnum' tests/qapi-schema/enum-missing-data.json:2: key 'data' is missing from enum 'MyEnum'

2
tests/qapi-schema/enum-wrong-data.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/enum-wrong-data.json: In enum 'MyEnum': tests/qapi-schema/enum-wrong-data.json: In enum 'MyEnum':
tests/qapi-schema/enum-wrong-data.json:2: Enum 'MyEnum' requires an array for 'data' tests/qapi-schema/enum-wrong-data.json:2: enum 'MyEnum' requires an array for 'data'

2
tests/qapi-schema/escape-outside-string.err
View File

@ -1 +1 @@
tests/qapi-schema/escape-outside-string.json:3:27: Stray '\' tests/qapi-schema/escape-outside-string.json:3:27: stray '\'

2
tests/qapi-schema/event-boxed-empty.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/event-boxed-empty.json: In event 'FOO': tests/qapi-schema/event-boxed-empty.json: In event 'FOO':
tests/qapi-schema/event-boxed-empty.json:2: Use of 'boxed' requires 'data' tests/qapi-schema/event-boxed-empty.json:2: use of 'boxed' requires 'data'

2
tests/qapi-schema/event-member-invalid-dict.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/event-member-invalid-dict.json: In event 'EVENT_A': tests/qapi-schema/event-member-invalid-dict.json: In event 'EVENT_A':
tests/qapi-schema/event-member-invalid-dict.json:1: Key 'type' is missing from member 'a' of 'data' for event 'EVENT_A' tests/qapi-schema/event-member-invalid-dict.json:1: key 'type' is missing from member 'a' of 'data' for event 'EVENT_A'

2
tests/qapi-schema/event-nest-struct.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/event-nest-struct.json: In event 'EVENT_A': tests/qapi-schema/event-nest-struct.json: In event 'EVENT_A':
tests/qapi-schema/event-nest-struct.json:1: Member 'a' of 'data' for event 'EVENT_A' should be a type name tests/qapi-schema/event-nest-struct.json:1: member 'a' of 'data' for event 'EVENT_A' should be a type name

2
tests/qapi-schema/features-bad-type.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/features-bad-type.json: In struct 'FeatureStruct0': tests/qapi-schema/features-bad-type.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-bad-type.json:1: Feature of struct FeatureStruct0 requires a string name tests/qapi-schema/features-bad-type.json:1: feature of struct FeatureStruct0 requires a string name

2
tests/qapi-schema/features-missing-name.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/features-missing-name.json: In struct 'FeatureStruct0': tests/qapi-schema/features-missing-name.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-missing-name.json:1: Key 'name' is missing from feature of struct FeatureStruct0 tests/qapi-schema/features-missing-name.json:1: key 'name' is missing from feature of struct FeatureStruct0

2
tests/qapi-schema/features-name-bad-type.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/features-name-bad-type.json: In struct 'FeatureStruct0': tests/qapi-schema/features-name-bad-type.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-name-bad-type.json:1: Feature of struct FeatureStruct0 requires a string name tests/qapi-schema/features-name-bad-type.json:1: feature of struct FeatureStruct0 requires a string name

2
tests/qapi-schema/features-no-list.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/features-no-list.json: In struct 'FeatureStruct0': tests/qapi-schema/features-no-list.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-no-list.json:1: Struct 'FeatureStruct0' requires an array for 'features' tests/qapi-schema/features-no-list.json:1: struct 'FeatureStruct0' requires an array for 'features'

2
tests/qapi-schema/features-unknown-key.err
View File

@ -1,3 +1,3 @@
tests/qapi-schema/features-unknown-key.json: In struct 'FeatureStruct0': tests/qapi-schema/features-unknown-key.json: In struct 'FeatureStruct0':
tests/qapi-schema/features-unknown-key.json:1: Unknown key 'colour' in feature of struct FeatureStruct0 tests/qapi-schema/features-unknown-key.json:1: unknown key 'colour' in feature of struct FeatureStruct0
Valid keys are 'if', 'name'. Valid keys are 'if', 'name'.

2
tests/qapi-schema/flat-union-array-branch.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-array-branch.json: In union 'TestUnion': tests/qapi-schema/flat-union-array-branch.json: In union 'TestUnion':
tests/qapi-schema/flat-union-array-branch.json:8: Member 'value1' of union 'TestUnion' cannot be an array tests/qapi-schema/flat-union-array-branch.json:8: member 'value1' of union 'TestUnion' cannot be an array

2
tests/qapi-schema/flat-union-bad-discriminator.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-bad-discriminator.json: In union 'TestUnion': tests/qapi-schema/flat-union-bad-discriminator.json: In union 'TestUnion':
tests/qapi-schema/flat-union-bad-discriminator.json:11: Discriminator of flat union 'TestUnion' requires a string name tests/qapi-schema/flat-union-bad-discriminator.json:11: discriminator of flat union 'TestUnion' requires a string name

2
tests/qapi-schema/flat-union-discriminator-bad-name.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-discriminator-bad-name.json: In union 'MyUnion': tests/qapi-schema/flat-union-discriminator-bad-name.json: In union 'MyUnion':
tests/qapi-schema/flat-union-discriminator-bad-name.json:7: Discriminator of flat union 'MyUnion' does not allow optional name '*switch' tests/qapi-schema/flat-union-discriminator-bad-name.json:7: discriminator of flat union 'MyUnion' does not allow optional name '*switch'

2
tests/qapi-schema/flat-union-empty.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-empty.json: In union 'Union': tests/qapi-schema/flat-union-empty.json: In union 'Union':
tests/qapi-schema/flat-union-empty.json:4: Union 'Union' has no branches tests/qapi-schema/flat-union-empty.json:4: union 'Union' has no branches

2
tests/qapi-schema/flat-union-inline-invalid-dict.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-inline-invalid-dict.json: In union 'TestUnion': tests/qapi-schema/flat-union-inline-invalid-dict.json: In union 'TestUnion':
tests/qapi-schema/flat-union-inline-invalid-dict.json:7: Key 'type' is missing from member 'value1' of union 'TestUnion' tests/qapi-schema/flat-union-inline-invalid-dict.json:7: key 'type' is missing from member 'value1' of union 'TestUnion'

2
tests/qapi-schema/flat-union-inline.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-inline.json: In union 'TestUnion': tests/qapi-schema/flat-union-inline.json: In union 'TestUnion':
tests/qapi-schema/flat-union-inline.json:7: Member 'value1' of union 'TestUnion' should be a type name tests/qapi-schema/flat-union-inline.json:7: member 'value1' of union 'TestUnion' should be a type name

2
tests/qapi-schema/flat-union-int-branch.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-int-branch.json: In union 'TestUnion': tests/qapi-schema/flat-union-int-branch.json: In union 'TestUnion':
tests/qapi-schema/flat-union-int-branch.json:8: Member 'value1' of union 'TestUnion' cannot use built-in type 'int' tests/qapi-schema/flat-union-int-branch.json:8: member 'value1' of union 'TestUnion' cannot use built-in type 'int'

2
tests/qapi-schema/flat-union-invalid-branch-key.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-invalid-branch-key.json: In union 'TestUnion': tests/qapi-schema/flat-union-invalid-branch-key.json: In union 'TestUnion':
tests/qapi-schema/flat-union-invalid-branch-key.json:13: Discriminator value 'value_wrong' is not found in enum 'TestEnum' tests/qapi-schema/flat-union-invalid-branch-key.json:13: discriminator value 'value_wrong' is not found in enum 'TestEnum'

2
tests/qapi-schema/flat-union-invalid-discriminator.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-invalid-discriminator.json: In union 'TestUnion': tests/qapi-schema/flat-union-invalid-discriminator.json: In union 'TestUnion':
tests/qapi-schema/flat-union-invalid-discriminator.json:10: Discriminator 'enum_wrong' is not a member of 'base' tests/qapi-schema/flat-union-invalid-discriminator.json:10: discriminator 'enum_wrong' is not a member of 'base'

2
tests/qapi-schema/flat-union-invalid-if-discriminator.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-invalid-if-discriminator.json: In union 'TestUnion': tests/qapi-schema/flat-union-invalid-if-discriminator.json: In union 'TestUnion':
tests/qapi-schema/flat-union-invalid-if-discriminator.json:10: The discriminator 'enum1' for union TestUnion must not be conditional tests/qapi-schema/flat-union-invalid-if-discriminator.json:10: the discriminator 'enum1' for union TestUnion must not be conditional

2
tests/qapi-schema/flat-union-no-base.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-no-base.json: In union 'TestUnion': tests/qapi-schema/flat-union-no-base.json: In union 'TestUnion':
tests/qapi-schema/flat-union-no-base.json:9: Flat union 'TestUnion' must have a base tests/qapi-schema/flat-union-no-base.json:9: flat union 'TestUnion' must have a base

2
tests/qapi-schema/flat-union-optional-discriminator.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-optional-discriminator.json: In union 'MyUnion': tests/qapi-schema/flat-union-optional-discriminator.json: In union 'MyUnion':
tests/qapi-schema/flat-union-optional-discriminator.json:7: Discriminator 'switch' is not a member of 'base' tests/qapi-schema/flat-union-optional-discriminator.json:7: discriminator 'switch' is not a member of 'base'

2
tests/qapi-schema/flat-union-string-discriminator.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/flat-union-string-discriminator.json: In union 'TestUnion': tests/qapi-schema/flat-union-string-discriminator.json: In union 'TestUnion':
tests/qapi-schema/flat-union-string-discriminator.json:13: Discriminator 'kind' must be of enumeration type tests/qapi-schema/flat-union-string-discriminator.json:13: discriminator 'kind' must be of enumeration type

2
tests/qapi-schema/funny-char.err
View File

@ -1 +1 @@
tests/qapi-schema/funny-char.json:2:36: Stray ';' tests/qapi-schema/funny-char.json:2:36: stray ';'

2
tests/qapi-schema/funny-word.err
View File

@ -1 +1 @@
tests/qapi-schema/funny-word.json:1:3: Stray 'command' tests/qapi-schema/funny-word.json:1:3: stray 'command'

2
tests/qapi-schema/ident-with-escape.err
View File

@ -1 +1 @@
tests/qapi-schema/ident-with-escape.json:3:3: Unknown escape \u tests/qapi-schema/ident-with-escape.json:3:3: unknown escape \u

2
tests/qapi-schema/include-before-err.err
View File

@ -1 +1 @@
tests/qapi-schema/include-before-err.json:2:13: Expected ':' tests/qapi-schema/include-before-err.json:2:13: expected ':'

2
tests/qapi-schema/include-cycle.err
View File

@ -1,3 +1,3 @@
In file included from tests/qapi-schema/include-cycle.json:1: In file included from tests/qapi-schema/include-cycle.json:1:
In file included from tests/qapi-schema/include-cycle-b.json:1: In file included from tests/qapi-schema/include-cycle-b.json:1:
tests/qapi-schema/include-cycle-c.json:1: Inclusion loop for include-cycle.json tests/qapi-schema/include-cycle-c.json:1: inclusion loop for include-cycle.json

2
tests/qapi-schema/include-extra-junk.err
View File

@ -1 +1 @@
tests/qapi-schema/include-extra-junk.json:3: Invalid 'include' directive tests/qapi-schema/include-extra-junk.json:3: invalid 'include' directive

2
tests/qapi-schema/include-nested-err.err
View File

@ -1,2 +1,2 @@
In file included from tests/qapi-schema/include-nested-err.json:1: In file included from tests/qapi-schema/include-nested-err.json:1:
tests/qapi-schema/missing-colon.json:1:10: Expected ':' tests/qapi-schema/missing-colon.json:1:10: expected ':'

2
tests/qapi-schema/include-non-file.err
View File

@ -1 +1 @@
tests/qapi-schema/include-non-file.json:1: Value of 'include' must be a string tests/qapi-schema/include-non-file.json:1: value of 'include' must be a string

2
tests/qapi-schema/include-self-cycle.err
View File

@ -1 +1 @@
tests/qapi-schema/include-self-cycle.json:1: Inclusion loop for include-self-cycle.json tests/qapi-schema/include-self-cycle.json:1: inclusion loop for include-self-cycle.json

2
tests/qapi-schema/leading-comma-list.err
View File

@ -1 +1 @@
tests/qapi-schema/leading-comma-list.json:2:13: Expected '{', '[', ']', string, boolean or 'null' tests/qapi-schema/leading-comma-list.json:2:13: expected '{', '[', ']', string, boolean or 'null'

2
tests/qapi-schema/leading-comma-object.err
View File

@ -1 +1 @@
tests/qapi-schema/leading-comma-object.json:1:3: Expected string or '}' tests/qapi-schema/leading-comma-object.json:1:3: expected string or '}'

2
tests/qapi-schema/missing-colon.err
View File

@ -1 +1 @@
tests/qapi-schema/missing-colon.json:1:10: Expected ':' tests/qapi-schema/missing-colon.json:1:10: expected ':'

2
tests/qapi-schema/missing-comma-list.err
View File

@ -1 +1 @@
tests/qapi-schema/missing-comma-list.json:2:20: Expected ',' or ']' tests/qapi-schema/missing-comma-list.json:2:20: expected ',' or ']'

2
tests/qapi-schema/missing-comma-object.err
View File

@ -1 +1 @@
tests/qapi-schema/missing-comma-object.json:2:3: Expected ',' or '}' tests/qapi-schema/missing-comma-object.json:2:3: expected ',' or '}'

2
tests/qapi-schema/missing-type.err
View File

@ -1 +1 @@
tests/qapi-schema/missing-type.json:2: Expression is missing metatype tests/qapi-schema/missing-type.json:2: expression is missing metatype

2
tests/qapi-schema/nested-struct-data-invalid-dict.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/nested-struct-data-invalid-dict.json: In command 'foo': tests/qapi-schema/nested-struct-data-invalid-dict.json: In command 'foo':
tests/qapi-schema/nested-struct-data-invalid-dict.json:2: Key 'type' is missing from member 'a' of 'data' for command 'foo' tests/qapi-schema/nested-struct-data-invalid-dict.json:2: key 'type' is missing from member 'a' of 'data' for command 'foo'

2
tests/qapi-schema/nested-struct-data.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/nested-struct-data.json: In command 'foo': tests/qapi-schema/nested-struct-data.json: In command 'foo':
tests/qapi-schema/nested-struct-data.json:2: Member 'a' of 'data' for command 'foo' should be a type name tests/qapi-schema/nested-struct-data.json:2: member 'a' of 'data' for command 'foo' should be a type name

2
tests/qapi-schema/non-objects.err
View File

@ -1 +1 @@
tests/qapi-schema/non-objects.json:1:1: Expected '{' tests/qapi-schema/non-objects.json:1:1: expected '{'

2
tests/qapi-schema/pragma-doc-required-crap.err
View File

@ -1 +1 @@
tests/qapi-schema/pragma-doc-required-crap.json:3: Pragma 'doc-required' must be boolean tests/qapi-schema/pragma-doc-required-crap.json:3: pragma 'doc-required' must be boolean

2
tests/qapi-schema/pragma-extra-junk.err
View File

@ -1 +1 @@
tests/qapi-schema/pragma-extra-junk.json:3: Invalid 'pragma' directive tests/qapi-schema/pragma-extra-junk.json:3: invalid 'pragma' directive

2
tests/qapi-schema/pragma-name-case-whitelist-crap.err
View File

@ -1 +1 @@
tests/qapi-schema/pragma-name-case-whitelist-crap.json:3: Pragma name-case-whitelist must be a list of strings tests/qapi-schema/pragma-name-case-whitelist-crap.json:3: pragma name-case-whitelist must be a list of strings

2
tests/qapi-schema/pragma-non-dict.err
View File

@ -1 +1 @@
tests/qapi-schema/pragma-non-dict.json:3: Value of 'pragma' must be an object tests/qapi-schema/pragma-non-dict.json:3: value of 'pragma' must be an object

2
tests/qapi-schema/pragma-returns-whitelist-crap.err
View File

@ -1 +1 @@
tests/qapi-schema/pragma-returns-whitelist-crap.json:3: Pragma returns-whitelist must be a list of strings tests/qapi-schema/pragma-returns-whitelist-crap.json:3: pragma returns-whitelist must be a list of strings

2
tests/qapi-schema/pragma-unknown.err
View File

@ -1 +1 @@
tests/qapi-schema/pragma-unknown.json:1: Unknown pragma 'no-such-pragma' tests/qapi-schema/pragma-unknown.json:1: unknown pragma 'no-such-pragma'

2
tests/qapi-schema/quoted-structural-chars.err
View File

@ -1 +1 @@
tests/qapi-schema/quoted-structural-chars.json:1:1: Expected '{' tests/qapi-schema/quoted-structural-chars.json:1:1: expected '{'

2
tests/qapi-schema/reserved-enum-q.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/reserved-enum-q.json: In enum 'Foo': tests/qapi-schema/reserved-enum-q.json: In enum 'Foo':
tests/qapi-schema/reserved-enum-q.json:4: Member of enum 'Foo' uses invalid name 'q-Unix' tests/qapi-schema/reserved-enum-q.json:4: member of enum 'Foo' uses invalid name 'q-Unix'

2
tests/qapi-schema/reserved-member-has.err
View File

@ -1,2 +1,2 @@
tests/qapi-schema/reserved-member-has.json: In command 'oops': tests/qapi-schema/reserved-member-has.json: In command 'oops':
tests/qapi-schema/reserved-member-has.json:5: Member of 'data' for command 'oops' uses reserved name 'has-a' tests/qapi-schema/reserved-member-has.json:5: member of 'data' for command 'oops' uses reserved name 'has-a'

Some files were not shown because too many files have changed in this diff Show More