From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 3 Aug 2020 11:21:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-08-03' into staging
X-Git-Tag: v5.1.0~11
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6c5dfc9ccb643a0d50fdec9f10806b14960571d1;p=mirror_qemu.git

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>
---

6c5dfc9ccb643a0d50fdec9f10806b14960571d1