[Qemu-devel] [PULL for-2.5 00/13] QMP and QObject patches

[Markus Armbruster]

The following changes since commit 1a4dab849d5d06191ab5e5850f6b8bfcad8ceb47:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 
(2015-11-25 14:47:06 +0000)

are available in the git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-11-26

for you to fetch changes up to df649835fe48f635a93316fdefe96ced7189316e:

  qjson: Limit number of tokens in addition to total size (2015-11-26 10:07:07 
+0100)

----------------------------------------------------------------
QMP and QObject patches

----------------------------------------------------------------
Markus Armbruster (10):
      monitor: Plug memory leak on QMP error
      qjson: Apply nesting limit more sanely
      qjson: Don't crash when input exceeds nesting limit
      check-qjson: Add test for JSON nesting depth limit
      qjson: Spell out some silent assumptions
      qjson: Give each of the six structural chars its own token type
      qjson: Inline token_is_keyword() and simplify
      qjson: Inline token_is_escape() and simplify
      qjson: Convert to parser to recursive descent
      qjson: Limit number of tokens in addition to total size

Paolo Bonzini (3):
      qjson: replace QString in JSONLexer with GString
      qjson: store tokens in a GQueue
      qjson: surprise, allocating 6 QObjects per token is expensive

 include/qapi/qmp/json-lexer.h    |  16 +-
 include/qapi/qmp/json-parser.h   |   4 +-
 include/qapi/qmp/json-streamer.h |  16 +-
 monitor.c                        |   3 +-
 qga/main.c                       |   2 +-
 qobject/json-lexer.c             |  48 +++---
 qobject/json-parser.c            | 330 ++++++++++++---------------------------
 qobject/json-streamer.c          |  89 ++++++-----
 qobject/qjson.c                  |   2 +-
 tests/check-qjson.c              |  25 +++
 tests/libqtest.c                 |   2 +-
 11 files changed, 224 insertions(+), 313 deletions(-)

-- 
2.4.3