The following changes since commit 2b5b7ae917e8db48431631b1c5d909fa46c223a6:
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-06-24' into staging (2014-06-24 17:14:57 +0100) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to f5264553c381c5f305d6e11bef18da6a29f3f423: iotests: Fix 083 for out-of-tree builds (2014-06-27 20:00:01 +0200) ---------------------------------------------------------------- Block patches for 2.1.0-rc0 ---------------------------------------------------------------- BenoƮt Canet (4): quorum: Add the rewrite-corrupted parameter to quorum block: Add node-name argument to drive-mirror block: Add replaces argument to drive-mirror qemu-iotests: Add TestRepairQuorum to 041 to test drive-mirror node-name mode. Chen Gang (1): block.c: Don't return success for bdrv_append_temp_snapshot() failure Fam Zheng (18): blockjob: Add block_job_yield() mirror: Go through ready -> complete process for 0 len image qemu-iotests: Test BLOCK_JOB_READY event for 0Kb image active commit qemu-iotests: Test 0-length image for mirror virtio-blk: Move VirtIOBlockReq to header virtio-blk: Convert VirtIOBlockReq.elem to pointer virtio-blk: Drop bounce buffer from dataplane code virtio-blk: Drop VirtIOBlockRequest.read virtio-blk: Replace VirtIOBlockRequest with VirtIOBlockReq virtio-blk: Use VirtIOBlockReq.in to drop VirtIOBlockReq.inhdr virtio-blk: Convert VirtIOBlockReq.out to structrue virtio-blk: Fill in VirtIOBlockReq.out in dataplane code virtio-blk: Fix and clean up the in_sg and out_sg check virtio-blk: Make request completion function virtual virtio-blk: Export request handling functions to dataplane virtio-blk: Schedule BH in the right context virtio-blk: Unify {non-,}dataplane's request handlings virtio-blk: Rename complete_request_early to complete_request_vring Jeff Cody (2): block: check for RESIZE blocker in the QMP command, not bdrv_truncate() block: add qemu-iotest for resize base during live commit Kevin Wolf (9): block: Create bdrv_fill_options() block: Move bdrv_fill_options() call to bdrv_open() block: Move json: parsing to bdrv_fill_options() block: Always pass driver name through options QDict block: Use common driver selection code for bdrv_open_file() block: Inline bdrv_file_open() block: Remove second bdrv_open() recursion block: Catch backing files assigned to non-COW drivers block: Remove a special case for protocols Markus Armbruster (2): blockjob: Fix recent BLOCK_JOB_READY regression blockjob: Fix recent BLOCK_JOB_ERROR regression Max Reitz (6): iotests: Allow out-of-tree run configure: Enable out-of-tree iotests iotests: Source common.env iotests: Use $PYTHON for Python scripts iotests: Drop Python version from 065's Shebang iotests: Fix 083 for out-of-tree builds Michal Privoznik (1): qemu_opts_append: Play nicely with QemuOptsList's head Peter Lieven (2): block/nfs: fix url parameter checking block/nfs: add knob to set readahead Stefan Hajnoczi (2): block: make bdrv_query_stats() static block: acquire AioContext in qmp_query_blockstats() block.c | 316 +++++++++++++++++++++------------------ block/cow.c | 1 + block/mirror.c | 71 +++++++-- block/nfs.c | 22 ++- block/qapi.c | 6 +- block/qcow.c | 1 + block/qcow2.c | 1 + block/qed.c | 1 + block/quorum.c | 97 +++++++++++- block/vmdk.c | 1 + blockdev.c | 47 +++++- blockjob.c | 22 ++- configure | 12 ++ hmp.c | 1 + hw/block/dataplane/virtio-blk.c | 246 +++--------------------------- hw/block/virtio-blk.c | 139 +++++++++-------- include/block/block.h | 6 +- include/block/block_int.h | 6 + include/block/blockjob.h | 8 + include/block/qapi.h | 1 - include/hw/virtio/virtio-blk.h | 23 +++ qapi/block-core.json | 30 +++- qmp-commands.hx | 5 + tests/qemu-iotests/031 | 8 +- tests/qemu-iotests/036 | 6 +- tests/qemu-iotests/039 | 18 +-- tests/qemu-iotests/040 | 12 +- tests/qemu-iotests/040.out | 4 +- tests/qemu-iotests/041 | 207 ++++++++++++++++++++++++- tests/qemu-iotests/041.out | 4 +- tests/qemu-iotests/051 | 6 + tests/qemu-iotests/051.out | 14 +- tests/qemu-iotests/054 | 2 +- tests/qemu-iotests/060 | 20 +-- tests/qemu-iotests/061 | 24 +-- tests/qemu-iotests/065 | 2 +- tests/qemu-iotests/081 | 15 +- tests/qemu-iotests/081.out | 10 ++ tests/qemu-iotests/083 | 10 +- tests/qemu-iotests/095 | 86 +++++++++++ tests/qemu-iotests/095.out | 31 ++++ tests/qemu-iotests/check | 110 ++++++++++++-- tests/qemu-iotests/common | 11 +- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.rc | 8 +- tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 3 +- util/qemu-option.c | 11 +- 48 files changed, 1127 insertions(+), 561 deletions(-) create mode 100755 tests/qemu-iotests/095 create mode 100644 tests/qemu-iotests/095.out