From: Peter Maydell Date: Thu, 26 Nov 2015 16:27:26 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-11-26' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641;p=sdk%2Femulator%2Fqemu.git 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 " # gpg: aka "Markus Armbruster " * 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 --- a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641