diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-03 12:21:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-03 12:21:57 +0100 |
| commit | 6c5dfc9ccb643a0d50fdec9f10806b14960571d1 (patch) | |
| tree | 0c646c0c7e9fcacf0a3589b6daba18ae861ded12 /tests | |
| parent | 92a95ab44655602e8665d5a0de13e0781a4fe824 (diff) | |
| parent | f7160f32186b4ae1e1327e3bd05060fffec8f9ae (diff) | |
| download | qemu-6c5dfc9ccb643a0d50fdec9f10806b14960571d1.zip qemu-6c5dfc9ccb643a0d50fdec9f10806b14960571d1.tar.gz qemu-6c5dfc9ccb643a0d50fdec9f10806b14960571d1.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-08-03' into staging
QAPI patches patches for 2020-08-03
# gpg: Signature made Mon 03 Aug 2020 10:08:30 BST
# 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-2020-08-03:
schemas: Add vim modeline
qapi: Delete unwanted indentation of top-level expressions
qapi/machine.json: Fix missing newline in doc comment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qapi-schema/doc-good.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/include/sub-module.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/qapi-schema-test.json | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/sub-sub-module.json | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/tests/qapi-schema/doc-good.json b/tests/qapi-schema/doc-good.json index ddd89d1..9da72a1 100644 --- a/tests/qapi-schema/doc-good.json +++ b/tests/qapi-schema/doc-good.json @@ -1,4 +1,6 @@ # -*- Mode: Python -*- +# vim: filetype=python +# # Positive QAPI doc comment tests { 'pragma': { 'doc-required': true } } diff --git a/tests/qapi-schema/include/sub-module.json b/tests/qapi-schema/include/sub-module.json index afdb267..b9f7b9b 100644 --- a/tests/qapi-schema/include/sub-module.json +++ b/tests/qapi-schema/include/sub-module.json @@ -1,4 +1,5 @@ # *-*- Mode: Python -*-* +# vim: filetype=python # Sub-module of ../qapi-schema-test.json diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json index 6b1f05a..3a9f2cb 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -1,4 +1,5 @@ # *-*- Mode: Python -*-* +# vim: filetype=python # This file is a stress test of supported qapi constructs that must # parse and compile correctly. diff --git a/tests/qapi-schema/sub-sub-module.json b/tests/qapi-schema/sub-sub-module.json index 524ef9b..94f36ec 100644 --- a/tests/qapi-schema/sub-sub-module.json +++ b/tests/qapi-schema/sub-sub-module.json @@ -1,4 +1,5 @@ # *-*- Mode: Python -*-* +# vim: filetype=python # Sub-module of sub-module include/sub-module.json of qapi-schema-test.json |