summary refs log tree commit diff stats
path: root/hw/virtio-net.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-28 14:41:25 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-28 14:41:25 -0600
commit6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c (patch)
tree0f9ca38c851e8e330a1bcdcd52c06da6b4a808c5 /hw/virtio-net.c
parent6034fe7bdb555c43022706e228cde8d52a8b341a (diff)
parent49b6d7220bce42e6c06e0dbb61969a997868491f (diff)
downloadfocaccia-qemu-6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c.tar.gz
focaccia-qemu-6cebf7afac9287f7bcaeb0d8fd64fd7b75e3fa2c.zip
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 'hw/virtio-net.c')
0 files changed, 0 insertions, 0 deletions