From: Peter Maydell <peter.maydell@linaro.org>
Date: Sun, 29 Jun 2014 12:39:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~738
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac8076ac8638428e2a96d5f6c7e80f2014f9e379;p=sdk%2Femulator%2Fqemu.git

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>
---

ac8076ac8638428e2a96d5f6c7e80f2014f9e379