Any change of getting this patch pulled in this batch?
"[PATCH v3] block.curl: adding 'timeout' option"
Thanks
On 08/22/2014 11:51 AM, Kevin Wolf wrote:
The following changes since commit 302fa283789a2f9b1199c327047cfad2258a23a2:
Revert "memory: Use canonical path component as the name" (2014-08-19
20:05:46 +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 bd39e6ed0b88a1473c652c97e731a156cccf16e2:
qemu-img: Allow cache mode specification for amend (2014-08-22 14:54:48
+0200)
----------------------------------------------------------------
Block patches
----------------------------------------------------------------
Fam Zheng (1):
blkdebug: Delete BH in bdrv_aio_cancel
Kevin Wolf (1):
qemu-iotests: Fix 028 reference output for qed
Maria Kustova (2):
runner: Add an argument for test duration
runner: Kill a program under test by time-out
Markus Armbruster (5):
block: Use g_new() & friends where that makes obvious sense
block: Use g_new() & friends to avoid multiplying sizes
qemu-io-cmds: g_renew() can't fail, bury dead error handling
block: Drop some superfluous casts from void *
vmdk: Use bdrv_nb_sectors() where sectors, not bytes are wanted
Max Reitz (12):
qcow2: Constant cache size in bytes
qcow2: Use g_try_new0() for cache array
qcow2: Add runtime options for cache sizes
iotests: Add test for qcow2's cache options
block: Add bdrv_refresh_filename()
blkdebug: Implement bdrv_refresh_filename()
blkverify: Implement bdrv_refresh_filename()
nbd: Implement bdrv_refresh_filename()
quorum: Implement bdrv_refresh_filename()
iotests: Add test for image filename construction
qemu-img: Allow source cache mode specification
qemu-img: Allow cache mode specification for amend
Michael Tokarev (1):
block/vvfat.c: remove debugging code to reinit stderr if NULL
Ming Lei (1):
test-coroutine: test cost introduced by coroutine
Peter Lieven (1):
block/iscsi: fix memory corruption on iscsi resize
Stefan Hajnoczi (4):
block: acquire AioContext in qmp_block_resize()
virtio-blk: allow block_resize with dataplane
raw-posix: fix O_DIRECT short reads
qemu-iotests: add test case 101 for short file I/O
zhanghailiang (1):
virtio-blk: fix reference a pointer which might be freed
block-migration.c | 6 +-
block.c | 149 +++++++++++++++++++++++++++++++++++++--
block/archipelago.c | 6 +-
block/blkdebug.c | 101 ++++++++++++++++++++++++++
block/blkverify.c | 29 ++++++++
block/bochs.c | 2 +-
block/gluster.c | 8 +--
block/iscsi.c | 5 +-
block/nbd.c | 36 ++++++++++
block/nfs.c | 2 +-
block/parallels.c | 2 +-
block/qcow.c | 2 +-
block/qcow2-cache.c | 13 ++--
block/qcow2-cluster.c | 2 +-
block/qcow2-refcount.c | 8 +--
block/qcow2-snapshot.c | 8 +--
block/qcow2.c | 120 ++++++++++++++++++++++++++++---
block/qcow2.h | 13 +++-
block/qed-check.c | 3 +-
block/quorum.c | 39 ++++++++++
block/raw-posix.c | 11 ++-
block/rbd.c | 6 +-
block/sheepdog.c | 6 +-
block/vdi.c | 2 +-
block/vhdx-log.c | 2 +-
block/vhdx.c | 4 +-
block/vmdk.c | 18 +++--
block/vvfat.c | 19 ++---
blockdev-nbd.c | 2 +-
blockdev.c | 15 ++--
hw/block/dataplane/virtio-blk.c | 1 +
hw/block/nvme.c | 8 +--
hw/block/virtio-blk.c | 3 +-
hw/ide/ahci.c | 2 +-
hw/ide/microdrive.c | 2 +-
include/block/block.h | 1 +
include/block/block_int.h | 6 ++
qemu-img-cmds.hx | 20 +++---
qemu-img.c | 97 +++++++++++++++++++------
qemu-img.texi | 16 +++--
qemu-io-cmds.c | 21 ++----
qemu-io.c | 2 +-
tests/image-fuzzer/runner.py | 50 ++++++++++---
tests/qemu-iotests/028 | 1 +
tests/qemu-iotests/028.out | 3 +-
tests/qemu-iotests/099 | 116 ++++++++++++++++++++++++++++++
tests/qemu-iotests/099.out | 20 ++++++
tests/qemu-iotests/101 | 58 +++++++++++++++
tests/qemu-iotests/101.out | 10 +++
tests/qemu-iotests/103 | 99 ++++++++++++++++++++++++++
tests/qemu-iotests/103.out | 29 ++++++++
tests/qemu-iotests/common.filter | 22 ++++++
tests/qemu-iotests/common.rc | 19 +----
tests/qemu-iotests/group | 3 +
tests/test-coroutine.c | 30 ++++++++
55 files changed, 1103 insertions(+), 175 deletions(-)
create mode 100755 tests/qemu-iotests/099
create mode 100644 tests/qemu-iotests/099.out
create mode 100755 tests/qemu-iotests/101
create mode 100644 tests/qemu-iotests/101.out
create mode 100755 tests/qemu-iotests/103
create mode 100644 tests/qemu-iotests/103.out
