On top of Kevin's block pull request from last week that is still pending. The following changes since commit 981cbf59b5360647e908186e7306ee9013a58c88:
qemu-iotests: Add sample image and test for VMDK version 3 (2013-11-29 17:41:14 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git block for you to fetch changes up to ac9524dc55dc32e492ac3e6fbc9785be7168f8a2: qemu-iotests: filter QEMU monitor \r\n (2013-12-06 16:53:51 +0100) ---------------------------------------------------------------- Fam Zheng (7): vmdk: Fix creating big description file qemu-iotests: Add "-c <cache-mode>" option qemu-iotests: Honour cache mode in iotests.py qemu-iotests: Add _default_cache_mode and _supported_cache_modes qemu-iotests: Change default cache mode to "writeback" qemu-iotests: Clean up spaces in usage output qemu-iotests: Split qcow2 only cases in 048 Hu Tao (1): qcow2: use start_of_cluster() and offset_into_cluster() everywhere Kevin Wolf (1): qcow2: Zero-initialise first cluster for new images Marc-André Lureau (2): coroutine: remove qemu_co_queue_wait_insert_head coroutine: remove unused CoQueue AioContext Max Reitz (1): block: Close backing file early in bdrv_img_create Paolo Bonzini (17): block: generalize BlockLimits handling to cover bdrv_aio_discard too block: add flags to BlockRequest block: add flags argument to bdrv_co_write_zeroes tracepoint block: add bdrv_aio_write_zeroes block: handle ENOTSUP from discard in generic code block: make bdrv_co_do_write_zeroes stricter in producing aligned requests vpc, vhdx: add get_info block drivers: add discard/write_zeroes properties to bdrv_get_info implementation block drivers: expose requirement for write same alignment from formats block/iscsi: check WRITE SAME support differently depending on MAY_UNMAP raw-posix: implement write_zeroes with MAY_UNMAP for files raw-posix: implement write_zeroes with MAY_UNMAP for block devices raw-posix: add support for write_zeroes on XFS and block devices qemu-iotests: 033 is fast scsi-disk: catch write protection errors in UNMAP scsi-disk: reject ANCHOR=1 for UNMAP and WRITE SAME commands scsi-disk: correctly implement WRITE SAME Peter Lieven (10): block/iscsi: remove .bdrv_has_zero_init block/iscsi: updated copyright qemu-img: add support for skipping zeroes in input during convert qemu-img: fix usage instruction for qemu-img convert block/iscsi: set bdi->cluster_size block: add opt_transfer_length to BlockLimits block/iscsi: set bs->bl.opt_transfer_length qemu-img: dynamically adjust iobuffer size during convert qemu-img: round down request length to an aligned sector qemu-img: decrease progress update interval on convert Stefan Hajnoczi (3): block: clean up bdrv_drain_all() throttling comments aio: make aio_poll(ctx, true) block with no fds qemu-iotests: filter QEMU monitor \r\n Wenchao Xia (6): snapshot: distinguish id and name in load_tmp qemu-nbd: support internal snapshot export qemu-iotests: add 058 internal snapshot export with qemu-nbd case qemu-img: add -l for snapshot in convert qemu-iotests: add test for snapshot in qemu-img convert qemu-nbd: add doc for option -f aio-posix.c | 5 - aio-win32.c | 5 - block.c | 160 +-- block/iscsi.c | 37 +- block/qcow2-cluster.c | 2 +- block/qcow2-refcount.c | 22 +- block/qcow2-snapshot.c | 10 +- block/qcow2.c | 39 +- block/qcow2.h | 5 +- block/qed.c | 3 + block/raw-aio.h | 3 +- block/raw-posix.c | 175 +++- block/snapshot.c | 77 +- block/vdi.c | 1 + block/vhdx.c | 13 + block/vmdk.c | 66 +- block/vpc.c | 15 + hw/scsi/scsi-disk.c | 154 ++- include/block/block.h | 4 + include/block/block_int.h | 7 +- include/block/coroutine.h | 7 - include/block/snapshot.h | 15 +- qemu-coroutine-lock.c | 8 - qemu-img-cmds.hx | 4 +- qemu-img.c | 169 ++-- qemu-img.texi | 12 +- qemu-nbd.c | 47 +- qemu-nbd.texi | 10 +- tests/qemu-iotests/026 | 3 +- tests/qemu-iotests/039 | 3 +- tests/qemu-iotests/048 | 27 - tests/qemu-iotests/048.out | 16 - tests/qemu-iotests/051.out | 112 +-- tests/qemu-iotests/052 | 4 +- tests/qemu-iotests/058 | 138 +++ tests/qemu-iotests/058.out | 44 + tests/qemu-iotests/059 | 5 + tests/qemu-iotests/059.out | 2012 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/074 | 86 ++ tests/qemu-iotests/074.out | 18 + tests/qemu-iotests/check | 3 +- tests/qemu-iotests/common | 37 +- tests/qemu-iotests/common.filter | 3 +- tests/qemu-iotests/common.rc | 28 +- tests/qemu-iotests/group | 4 +- tests/qemu-iotests/iotests.py | 3 +- tests/test-aio.c | 1 - trace-events | 4 +- 48 files changed, 3238 insertions(+), 388 deletions(-) create mode 100755 tests/qemu-iotests/058 create mode 100644 tests/qemu-iotests/058.out create mode 100755 tests/qemu-iotests/074 create mode 100644 tests/qemu-iotests/074.out -- 1.8.4.2