* [PULL 0/1] QAPI patches for 2020-04-07
@ 2020-04-07 11:45 Markus Armbruster
2020-04-07 11:45 ` [PULL 1/1] json: Fix check for unbalanced right curly brace Markus Armbruster
2020-04-07 16:38 ` [PULL 0/1] QAPI patches for 2020-04-07 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Markus Armbruster @ 2020-04-07 11:45 UTC (permalink / raw)
To: qemu-devel
The following changes since commit 53ef8a92eb04ee19640f5aad3bff36cd4a36c250:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200406' into staging (2020-04-06 12:36:45 +0100)
are available in the Git repository at:
git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2020-04-07
for you to fetch changes up to 1394dc0690e7a1514bd6594322d5a2105e881769:
json: Fix check for unbalanced right curly brace (2020-04-07 13:10:11 +0200)
----------------------------------------------------------------
QAPI patches for 2020-04-07
----------------------------------------------------------------
Simran Singhal (1):
json: Fix check for unbalanced right curly brace
qobject/json-streamer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.21.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] json: Fix check for unbalanced right curly brace
2020-04-07 11:45 [PULL 0/1] QAPI patches for 2020-04-07 Markus Armbruster
@ 2020-04-07 11:45 ` Markus Armbruster
2020-04-07 16:38 ` [PULL 0/1] QAPI patches for 2020-04-07 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2020-04-07 11:45 UTC (permalink / raw)
To: qemu-devel; +Cc: Simran Singhal
From: Simran Singhal <singhalsimran0@gmail.com>
We immediately diagnose unbalanced right curly brace:
$ qemu-kvm --nodefaults --nographic --qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 2, "major": 4},
"package": "v5.0.0-rc1-1-gf6ce4a439a08"}, "capabilities": ["oob"]}}
}
{"error": {"class": "GenericError", "desc": "JSON parse error,
expecting value"}}
except within square bracket:
[}
The check for unbalanced braces has a typo. Fix it.
Fixes: 8d3265b3d00db1071d1d3bf8433b4818088fdeb5
Signed-off-by: Simran Singhal <singhalsimran0@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200402182848.GA3023@simran-Inspiron-5558>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message rewritten to explain what's broken]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qobject/json-streamer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index 47dd7ea576..b93d97b995 100644
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -85,7 +85,7 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
g_queue_push_tail(&parser->tokens, token);
if ((parser->brace_count > 0 || parser->bracket_count > 0)
- && parser->bracket_count >= 0 && parser->bracket_count >= 0) {
+ && parser->brace_count >= 0 && parser->bracket_count >= 0) {
return;
}
--
2.21.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/1] QAPI patches for 2020-04-07
2020-04-07 11:45 [PULL 0/1] QAPI patches for 2020-04-07 Markus Armbruster
2020-04-07 11:45 ` [PULL 1/1] json: Fix check for unbalanced right curly brace Markus Armbruster
@ 2020-04-07 16:38 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2020-04-07 16:38 UTC (permalink / raw)
To: Markus Armbruster; +Cc: QEMU Developers
On Tue, 7 Apr 2020 at 12:46, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit 53ef8a92eb04ee19640f5aad3bff36cd4a36c250:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200406' into staging (2020-04-06 12:36:45 +0100)
>
> are available in the Git repository at:
>
> git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2020-04-07
>
> for you to fetch changes up to 1394dc0690e7a1514bd6594322d5a2105e881769:
>
> json: Fix check for unbalanced right curly brace (2020-04-07 13:10:11 +0200)
>
> ----------------------------------------------------------------
> QAPI patches for 2020-04-07
>
> ----------------------------------------------------------------
> Simran Singhal (1):
> json: Fix check for unbalanced right curly brace
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-07 16:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-07 11:45 [PULL 0/1] QAPI patches for 2020-04-07 Markus Armbruster
2020-04-07 11:45 ` [PULL 1/1] json: Fix check for unbalanced right curly brace Markus Armbruster
2020-04-07 16:38 ` [PULL 0/1] QAPI patches for 2020-04-07 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.