The following changes since commit 43cbeffb19877c62cbe0aaf08b2f235d98d71340:
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2014-05-08 12:38:01 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 5a007547df76446ab891df93ebc55749716609bf: glib: fix g_poll early timeout on windows (2014-05-09 20:57:35 +0200) ---------------------------------------------------------------- Block pull request ---------------------------------------------------------------- Fam Zheng (4): qemu-img: Convert by cluster size if target is compressed vmdk: Implement .bdrv_write_compressed vmdk: Implement .bdrv_get_info() qemu-iotests: Test converting to streamOptimized from small cluster size Jeff Cody (3): block: qemu-iotests - add common.qemu, for bash-controlled qemu tests block: qemu-iotests - update 085 to use common.qemu block: qemu-iotests - test for live migration Kevin Wolf (1): block: Fix open flags with BDRV_O_SNAPSHOT Kirill Batuzov (1): vl.c: remove init_clocks call from main Max Reitz (4): qcow2: Fix alloc_clusters_noref() overflow detection iotests: Use configured python block/nfs: Check for NULL server part block/raw-posix: Try both FIEMAP and SEEK_HOLE Mike Day (1): qemu-img: sort block formats in help message Peter Krempa (1): gluster: Correctly propagate errors when volume isn't accessible Peter Lieven (1): block/iscsi: bump year in copyright notice Sangho Park (1): glib: fix g_poll early timeout on windows block.c | 34 +++---- block/gluster.c | 7 +- block/iscsi.c | 2 +- block/nfs.c | 4 + block/qcow2-refcount.c | 4 +- block/raw-posix.c | 127 +++++++++++++++----------- block/vmdk.c | 35 ++++++++ configure | 6 ++ include/block/block.h | 6 +- include/glib-compat.h | 9 +- qemu-img.c | 29 +++++- qemu-timer.c | 3 + tests/qemu-iotests/031 | 9 +- tests/qemu-iotests/036 | 7 +- tests/qemu-iotests/039 | 19 ++-- tests/qemu-iotests/051 | 4 + tests/qemu-iotests/051.out | 10 +++ tests/qemu-iotests/054 | 3 +- tests/qemu-iotests/059 | 7 ++ tests/qemu-iotests/059.out | 8 ++ tests/qemu-iotests/060 | 21 ++--- tests/qemu-iotests/061 | 25 +++--- tests/qemu-iotests/065 | 2 +- tests/qemu-iotests/083 | 3 +- tests/qemu-iotests/085 | 73 +++------------ tests/qemu-iotests/091 | 105 ++++++++++++++++++++++ tests/qemu-iotests/091.out | 28 ++++++ tests/qemu-iotests/check | 18 +++- tests/qemu-iotests/common.qemu | 200 +++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + util/oslib-win32.c | 112 +++++++++++++++++++++++ vl.c | 1 - 32 files changed, 744 insertions(+), 178 deletions(-) create mode 100755 tests/qemu-iotests/091 create mode 100644 tests/qemu-iotests/091.out create mode 100644 tests/qemu-iotests/common.qemu -- 1.9.0