Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging

Enterprise / Virtualization / QEMU - Anthony Liguori [amazon.com] - 24 January 2014 17:43 UTC

0d688cf Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging

Makefile.objs | 1 -
block.c | 1024 ++++++++++++++++++++++++++++++++----------
block/backup.c | 7 +-
block/blkdebug.c | 81 +++-
block/blkverify.c | 31 +-
block/cow.c | 3 +-
block/curl.c | 81 +++-
block/gluster.c | 318 ++++++-------
block/iscsi.c | 59 ++-
block/mirror.c | 39 ++
block/qapi.c | 114 ++---
block/qcow.c | 3 +-
block/qcow2.c | 13 +-
block/qcow2.h | 6 +-
block/qed.c | 15 +-
block/raw-posix.c | 102 ++++-
block/raw-win32.c | 41 ++
block/rbd.c | 130 +-----
block/sheepdog.c | 25 +-
block/stream.c | 2 +
block/vhdx.c | 2 +-
block/vmdk.c | 45 +-
blockdev.c | 112 +++--
configure | 8 +
hmp-commands.hx | 5 +
hmp.c | 14 +-
hw/block/virtio-blk.c | 2 +-
hw/ide/core.c | 2 +-
hw/scsi/scsi-disk.c | 2 +-
hw/scsi/scsi-generic.c | 2 +-
hw/virtio/dataplane/vring.c | 2 +-
include/block/block.h | 44 +-
include/block/block_int.h | 48 +-
include/block/qapi.h | 1 +
include/monitor/monitor.h | 2 +-
include/monitor/readline.h | 56 ---
include/qapi/qmp/qdict.h | 1 +
include/qemu-io.h | 3 +
include/qemu/config-file.h | 6 +
include/qemu/osdep.h | 2 +
include/qemu/readline.h | 62 +++
monitor.c | 41 +-
qapi-schema.json | 183 +++++++-
qemu-doc.texi | 8 +-
qemu-img.texi | 19 +-
qemu-io-cmds.c | 57 +++
qemu-io.c | 119 +++--
qmp-commands.hx | 117 ++++-
qobject/qdict.c | 91 +++-
readline.c | 493 --------------------
scripts/qapi.py | 2 +-
tests/check-qdict.c | 156 +++++++
tests/fdc-test.c | 5 +-
tests/ide-test.c | 3 -
tests/qemu-iotests/017 | 1 +
tests/qemu-iotests/018 | 1 +
tests/qemu-iotests/019 | 3 +
tests/qemu-iotests/020 | 3 +
tests/qemu-iotests/034 | 3 +
tests/qemu-iotests/037 | 3 +
tests/qemu-iotests/051.out | 2 +-
tests/qemu-iotests/059 | 16 +
tests/qemu-iotests/059.out | 79 ++++
tests/qemu-iotests/063 | 3 +
tests/qemu-iotests/069 | 1 +
tests/qemu-iotests/071 | 239 ++++++++++
tests/qemu-iotests/071.out | 90 ++++
tests/qemu-iotests/072 | 69 +++
tests/qemu-iotests/072.out | 21 +
tests/qemu-iotests/077 | 278 ++++++++++++
tests/qemu-iotests/077.out | 202 +++++++++
tests/qemu-iotests/common.rc | 28 +-
tests/qemu-iotests/group | 3 +
util/Makefile.objs | 1 +
util/oslib-posix.c | 23 +
util/oslib-win32.c | 19 +
util/qemu-config.c | 100 +++++
util/qemu-progress.c | 11 +-
util/readline.c | 495 ++++++++++++++++++++
79 files changed, 4099 insertions(+), 1405 deletions(-)

Upstream: git.qemu.org

  • Share