]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'luiz/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Jan 2013 20:41:25 +0000 (14:41 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Jan 2013 20:41:25 +0000 (14:41 -0600)
commit6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c
tree0f9ca38c851e8e330a1bcdcd52c06da6b4a808c5
parent6034fe7bdb555c43022706e228cde8d52a8b341a
parent49b6d7220bce42e6c06e0dbb61969a997868491f
Merge remote-tracking branch 'luiz/queue/qmp' into staging

# By Lei Li (3) and others
# Via Luiz Capitulino
* luiz/queue/qmp:
  QAPI: Introduce memchar-read QMP command
  QAPI: Introduce memchar-write QMP command
  qemu-char: Add new char backend CirMemCharDriver
  docs: document virtio-balloon stats
  balloon: re-enable balloon stats
  balloon: drop old stats code & API
  block: Monitor command commit neglects to report some errors
qemu-char.c