diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-05 15:15:32 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-05 15:15:32 +0000 |
| commit | bb736b20a31fa9956195565ea34bc9c28953e70d (patch) | |
| tree | c1fdebda08b415457dcb2e39adb92127078664c0 /tests | |
| parent | 9a7beaad3dbba982f7a461d676b55a5c3851d312 (diff) | |
| parent | 0e92a19b8c3b269dee377b76898c8bd7cadc1273 (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-03-05' into staging
QAPI patches patches for 2021-03-05
# gpg: Signature made Fri 05 Mar 2021 14:42:18 GMT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2021-03-05:
qapi: Fix parse errors for removal of null from schema language
qapi: Remove QMP events and commands from user-mode builds
qga: Utilize QAPI_LIST_APPEND in qmp_guest_network_get_interfaces
error: Fix "Converting to ERRP_GUARD()" doc on "valid at return"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qapi-schema/leading-comma-list.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/trailing-comma-list.err | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/qapi-schema/leading-comma-list.err b/tests/qapi-schema/leading-comma-list.err index 76eed2b5b3..0725d6529f 100644 --- a/tests/qapi-schema/leading-comma-list.err +++ b/tests/qapi-schema/leading-comma-list.err @@ -1 +1 @@ -leading-comma-list.json:2:13: expected '{', '[', ']', string, boolean or 'null' +leading-comma-list.json:2:13: expected '{', '[', ']', string, or boolean diff --git a/tests/qapi-schema/trailing-comma-list.err b/tests/qapi-schema/trailing-comma-list.err index ad2f2d7c97..bb5f8c3c90 100644 --- a/tests/qapi-schema/trailing-comma-list.err +++ b/tests/qapi-schema/trailing-comma-list.err @@ -1 +1 @@ -trailing-comma-list.json:2:36: expected '{', '[', string, boolean or 'null' +trailing-comma-list.json:2:36: expected '{', '[', string, or boolean |