diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-28 14:41:25 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-28 14:41:25 -0600 |
commit | 6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c (patch) | |
tree | 0f9ca38c851e8e330a1bcdcd52c06da6b4a808c5 /block.c | |
parent | 6034fe7bdb555c43022706e228cde8d52a8b341a (diff) | |
parent | 49b6d7220bce42e6c06e0dbb61969a997868491f (diff) | |
download | qemu-6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c.zip qemu-6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c.tar.gz qemu-6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c.tar.bz2 |
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
Diffstat (limited to 'block.c')
0 files changed, 0 insertions, 0 deletions