From: Peter Maydell Date: Tue, 17 Nov 2020 21:06:58 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2020-11-17' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=84dae210506784945ec8342a613d7bd62ae6ec62;p=qemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2020-11-17' into staging QObject patches patches for 2020-11-17 # gpg: Signature made Tue 17 Nov 2020 14:41:06 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster " [full] # gpg: aka "Markus Armbruster " [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qobject-2020-11-17: json: Fix a memleak in parse_pair() Signed-off-by: Peter Maydell --- 84dae210506784945ec8342a613d7bd62ae6ec62