Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Enterprise / Virtualization / QEMU - Peter Maydell [linaro.org] - 25 February 2014 04:50 UTC

e7a1d6c Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

block.c | 232 ++++++------
block/Makefile.objs | 1 +
block/blkdebug.c | 3 +-
block/blkverify.c | 114 +-----
block/bochs.c | 3 +-
block/cow.c | 16 +-
block/curl.c | 13 +-
block/gluster.c | 28 +-
block/iscsi.c | 142 ++++----
block/nbd.c | 43 +--
block/parallels.c | 3 +-
block/qcow.c | 20 +-
block/qcow2-cluster.c | 22 +-
block/qcow2.c | 20 +-
block/qed.c | 24 +-
block/quorum.c | 870 ++++++++++++++++++++++++++++++++++++++++++++
block/sheepdog.c | 7 +-
block/vdi.c | 29 +-
block/vhdx.c | 25 +-
block/vmdk.c | 142 +++++---
block/vpc.c | 3 +-
block/vvfat.c | 15 +-
blockdev.c | 22 +-
configure | 36 ++
docs/qmp/qmp-events.txt | 36 ++
hw/block/xen_disk.c | 4 +-
include/block/block.h | 13 +-
include/block/nbd.h | 6 -
include/monitor/monitor.h | 2 +
include/qemu-common.h | 2 +
include/qemu/option.h | 2 +
monitor.c | 5 +
nbd.c | 66 ----
qapi-schema.json | 21 +-
qemu-img.c | 145 +++++---
qemu-io.c | 8 +-
qemu-nbd.c | 54 ++-
qobject/qdict.c | 60 ++-
tests/check-qdict.c | 75 +++-
tests/qemu-iotests/046 | 18 +-
tests/qemu-iotests/051.out | 4 +-
tests/qemu-iotests/059.out | 6 +-
tests/qemu-iotests/081 | 146 ++++++++
tests/qemu-iotests/081.out | 49 +++
tests/qemu-iotests/082 | 208 +++++++++++
tests/qemu-iotests/082.out | 529 +++++++++++++++++++++++++++
tests/qemu-iotests/group | 2 +
util/iov.c | 106 ++++++
util/qemu-config.c | 6 +
util/qemu-option.c | 49 +++
50 files changed, 2820 insertions(+), 635 deletions(-)

Upstream: git.qemu.org

  • Share