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

qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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>

Peter Maydell 6 years ago 3f0fb073 8f0d25c4

+1 -1

1 changed file

expand all

qobject

json-streamer.c

+1 -1

qobject/json-streamer.c

··· 85 85 g_queue_push_tail(&parser->tokens, token); 86 86 87 87 if ((parser->brace_count > 0 || parser->bracket_count > 0) 88 - && parser->bracket_count >= 0 && parser->bracket_count >= 0) { 88 + && parser->brace_count >= 0 && parser->bracket_count >= 0) { 89 89 return; 90 90 } 91 91