]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sun, 29 Jun 2014 12:39:04 +0000 (13:39 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Sun, 29 Jun 2014 12:39:04 +0000 (13:39 +0100)
commitac8076ac8638428e2a96d5f6c7e80f2014f9e379
treea6e38f0da9323a58408c44070ea97b526c0a6f14
parent76fbbec9315f8712d921411fbb4dad1fbcf1b151
parenta22d8e47f7efb15a96162b92b50f8fb108b1c5d9
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  docs/qmp: Fix documentation of BLOCK_JOB_READY to match code
  char: report frontend open/closed state in 'query-chardev'
  virtio-serial: report frontend connection state via monitor
  qmp: add qmp-events.txt back
  qapi event: clean up in callers
  qapi script: clean up in scripts
  qapi: ignore generated event files
  qapi: move event defines

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
qapi-schema.json