From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 29 Oct 2020 10:03:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2020-10-27' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c0444009147aa935d52d5acfc6b70094bb42b0dd;p=qemu.git

Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2020-10-27' into staging

QMP patches patches for 2020-10-27

# gpg: Signature made Tue 27 Oct 2020 10:13:00 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-qmp-2020-10-27:
  scripts/qmp: delete 'qmp' script
  qmp-shell: Sort by key when pretty-printing

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

c0444009147aa935d52d5acfc6b70094bb42b0dd