[qemu-xen master] Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-08-03' into staging

[patchbot@xxxxxxx]

commit 6c5dfc9ccb643a0d50fdec9f10806b14960571d1
Merge: 92a95ab44655602e8665d5a0de13e0781a4fe824 
f7160f32186b4ae1e1327e3bd05060fffec8f9ae
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Mon Aug 3 12:21:57 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Aug 3 12:21:57 2020 +0100

    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@xxxxxxxxxx"
    # gpg: Good signature from "Markus Armbruster <armbru@xxxxxxxxxx>" [full]
    # gpg:                 aka "Markus Armbruster <armbru@xxxxxxxxxxxx>" [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@xxxxxxxxxx>

 docs/interop/firmware.json                |  1 +
 docs/interop/vhost-user.json              |  1 +
 qapi/authz.json                           |  1 +
 qapi/block-core.json                      | 27 ++++++++++++++-------------
 qapi/block.json                           |  1 +
 qapi/char.json                            |  1 +
 qapi/common.json                          |  1 +
 qapi/control.json                         |  1 +
 qapi/crypto.json                          |  1 +
 qapi/dump.json                            |  1 +
 qapi/error.json                           |  1 +
 qapi/introspect.json                      |  1 +
 qapi/job.json                             |  1 +
 qapi/machine-target.json                  |  1 +
 qapi/machine.json                         |  4 +++-
 qapi/migration.json                       |  1 +
 qapi/misc-target.json                     |  1 +
 qapi/misc.json                            |  1 +
 qapi/net.json                             |  1 +
 qapi/qapi-schema.json                     |  1 +
 qapi/qdev.json                            |  1 +
 qapi/qom.json                             |  1 +
 qapi/rdma.json                            |  1 +
 qapi/rocker.json                          |  1 +
 qapi/run-state.json                       |  1 +
 qapi/sockets.json                         |  1 +
 qapi/tpm.json                             |  1 +
 qapi/transaction.json                     |  1 +
 qapi/ui.json                              |  5 +++--
 qga/qapi-schema.json                      |  1 +
 storage-daemon/qapi/qapi-schema.json      |  1 +
 tests/qapi-schema/doc-good.json           |  2 ++
 tests/qapi-schema/include/sub-module.json |  1 +
 tests/qapi-schema/qapi-schema-test.json   |  1 +
 tests/qapi-schema/sub-sub-module.json     |  1 +
 35 files changed, 53 insertions(+), 16 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master