summary refs log tree commit diff stats
path: root/qobject/json-lexer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-09-24 15:43:33 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-09-24 15:43:33 +0100
commitefd1d5229fbf09f2ef535df024ccaa620a013f86 (patch)
tree73762a032ab44235edd0a8e1ef3abaf19f3838d7 /qobject/json-lexer.c
parentd6f71af65410d3e003ba331c5e57eddcf716cbcf (diff)
parent176160ce78b58f29d765ddace885e88a732df34a (diff)
downloadfocaccia-qemu-efd1d5229fbf09f2ef535df024ccaa620a013f86.tar.gz
focaccia-qemu-efd1d5229fbf09f2ef535df024ccaa620a013f86.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-09-01' into staging
Monitor patches for 2018-09-01

# gpg: Signature made Sat 01 Sep 2018 12:06:52 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-monitor-2018-09-01:
  monitor: no need to save need_resume
  Revert "qmp: isolate responses into io thread"
  qmp: constify qmp_is_oob()
  monitor: consitify qmp_send_response() QDict argument
  monitor: accept input on resume
  monitor: simplify monitor_qmp_setup_handlers_bh

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qobject/json-lexer.c')
0 files changed, 0 insertions, 0 deletions