From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 7 Apr 2020 15:05:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-04-07' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3f0fb073792180ccb1646d662e2d13260f2dd984;p=qmiga%2Fqemu.git

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-04-07' into staging

QAPI patches for 2020-04-07

# gpg: Signature made Tue 07 Apr 2020 12:43:38 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-04-07:
  json: Fix check for unbalanced right curly brace

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

3f0fb073792180ccb1646d662e2d13260f2dd984