diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-26 16:27:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-26 16:27:26 +0000 |
| commit | a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641 (patch) | |
| tree | 2cd3979487530578d20d526496387c2ecfb27d9a /block.c | |
| parent | 317e4db6e90421abeeebc78f1a3e8472a76b2e74 (diff) | |
| parent | df649835fe48f635a93316fdefe96ced7189316e (diff) | |
| download | qemu-a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641.zip qemu-a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641.tar.gz qemu-a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-11-26' into staging
QMP and QObject patches
# gpg: Signature made Thu 26 Nov 2015 09:07:18 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-monitor-2015-11-26:
qjson: Limit number of tokens in addition to total size
qjson: surprise, allocating 6 QObjects per token is expensive
qjson: store tokens in a GQueue
qjson: Convert to parser to recursive descent
qjson: replace QString in JSONLexer with GString
qjson: Inline token_is_escape() and simplify
qjson: Inline token_is_keyword() and simplify
qjson: Give each of the six structural chars its own token type
qjson: Spell out some silent assumptions
check-qjson: Add test for JSON nesting depth limit
qjson: Don't crash when input exceeds nesting limit
qjson: Apply nesting limit more sanely
monitor: Plug memory leak on QMP error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block.c')
0 files changed, 0 insertions, 0 deletions