Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qapi: Improve reporting of missing / unknown definition keys
Have check_exprs() call check_keys() later, so its error messages gain an "in definition" line. Both check_keys() and check_name_is_str() check the definition's name is a string. Since check_keys() now runs after check_name_is_str() rather than before, its check is dead. Bury it. Checking values in check_keys() is unclean anyway. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20190927134639.4284-21-armbru@redhat.com>
- Loading branch information
Markus Armbruster
committed
Sep 28, 2019
1 parent
a6735a5
commit 3f58cc2
Showing
7 changed files
with
25 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
tests/qapi-schema/alternate-base.json: In alternate 'Alt': | ||
tests/qapi-schema/alternate-base.json:4: unknown key 'base' in alternate 'Alt' | ||
Valid keys are 'alternate', 'data', 'if'. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
tests/qapi-schema/bad-type-bool.json:2: 'struct' key must have a string value | ||
tests/qapi-schema/bad-type-bool.json:2: 'struct' requires a string name |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
tests/qapi-schema/bad-type-dict.json:2: 'command' key must have a string value | ||
tests/qapi-schema/bad-type-dict.json:2: 'command' requires a string name |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
tests/qapi-schema/double-type.json: In struct 'bar': | ||
tests/qapi-schema/double-type.json:2: unknown key 'command' in struct 'bar' | ||
Valid keys are 'base', 'data', 'features', 'if', 'struct'. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
tests/qapi-schema/enum-missing-data.json: In enum 'MyEnum': | ||
tests/qapi-schema/enum-missing-data.json:2: key 'data' is missing from enum 'MyEnum' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
tests/qapi-schema/unknown-expr-key.json: In struct 'bar': | ||
tests/qapi-schema/unknown-expr-key.json:2: unknown keys 'bogus', 'phony' in struct 'bar' | ||
Valid keys are 'base', 'data', 'features', 'if', 'struct'. |