[ Posting only the new patches in v2 as replies, see v1 for the rest ] The following changes since commit cebbae86b4f7ee3d3dd9df906b97d269e70d9cc7:
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging (2015-02-06 14:35:52 +0000) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 728dacbda817b2ca259e9d337fab06bcf14e94a6: block/raw-posix.c: Fix raw_getlength() on Mac OS X block devices (2015-02-06 18:00:53 +0100) ---------------------------------------------------------------- Block patches for 2.3 ---------------------------------------------------------------- Alberto Garcia (1): block: Give always priority to unused entries in the qcow2 L2 cache Denis V. Lunev (7): block/raw-posix: create translate_err helper to merge errno values block/raw-posix: create do_fallocate helper block/raw-posix: refactor handle_aiocb_write_zeroes a bit block: use fallocate(FALLOC_FL_ZERO_RANGE) in handle_aiocb_write_zeroes block/raw-posix: call plain fallocate in handle_aiocb_write_zeroes block: use fallocate(FALLOC_FL_PUNCH_HOLE) & fallocate(0) to write zeroes nbd: fix max_discard/max_transfer_length Don Slutz (1): qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION Dr. David Alan Gilbert (2): Restore atapi_dma flag across migration atapi migration: Throw recoverable error to avoid recovery Fam Zheng (2): qed: Really remove unused field QEDAIOCB.finished qemu-iotests: Fix supported_oses check Francesco Romani (1): block: add event when disk usage exceeds threshold Jeff Cody (1): block: fix off-by-one error in qcow and qcow2 Kevin Wolf (1): Merge remote-tracking branch 'mreitz/block' into queue-block Markus Armbruster (4): blockdev: Give find_block_job() an Error ** parameter blockdev: Eliminate silly QERR_BLOCK_JOB_NOT_ACTIVE macro block: New bdrv_add_key(), convert monitor to use it block: Eliminate silly QERR_ macros used for encryption keys Max Reitz (6): iotests: Specify format for qemu-nbd iotests: Fix 083 iotests: Fix 100 for nbd iotests: Fix 104 for NBD nbd: Improve error messages qcow2: Rewrite qcow2_alloc_bytes() Peter Lieven (7): block: change default for discard and write zeroes to INT_MAX block: add accounting for merged requests hw/virtio-blk: add a constant for max number of merged requests block-backend: expose bs->bl.max_transfer_length virtio-blk: introduce multiread virtio-blk: add a knob to disable request merging block: introduce BDRV_REQUEST_MAX_SECTORS Peter Wu (12): block/dmg: properly detect the UDIF trailer block/dmg: extract mish block decoding functionality block/dmg: extract processing of resource forks block/dmg: process a buffer instead of reading ints block/dmg: validate chunk size to avoid overflow block/dmg: process XML plists block/dmg: set virtual size to a non-zero value block/dmg: fix sector data offset calculation block/dmg: use SectorNumber from BLKX header block/dmg: factor out block type check block/dmg: support bzip2 block entry types block/dmg: improve zeroes handling Programmingkid (1): block/raw-posix.c: Fix raw_getlength() on Mac OS X block devices Stefan Hajnoczi (2): qed: check for header size overflow qemu-iotests: add 116 invalid QED input file tests block.c | 65 +++-- block/Makefile.objs | 2 + block/accounting.c | 7 + block/block-backend.c | 5 + block/dmg.c | 502 ++++++++++++++++++++++++++++++--------- block/nbd-client.c | 4 +- block/nbd-client.h | 2 +- block/nbd.c | 11 +- block/qapi.c | 5 + block/qcow.c | 2 +- block/qcow2-cache.c | 4 +- block/qcow2-refcount.c | 78 +++--- block/qcow2.c | 2 +- block/qed.c | 5 + block/qed.h | 1 - block/raw-posix.c | 140 ++++++++--- block/write-threshold.c | 125 ++++++++++ blockdev.c | 44 +--- configure | 50 ++++ hmp.c | 6 +- hw/block/dataplane/virtio-blk.c | 8 +- hw/block/virtio-blk.c | 299 +++++++++++++++-------- hw/ide/atapi.c | 17 ++ hw/ide/core.c | 1 + hw/ide/internal.h | 2 + hw/ide/pci.c | 11 + include/block/accounting.h | 3 + include/block/block.h | 4 + include/block/block_int.h | 4 + include/block/nbd.h | 2 +- include/block/write-threshold.h | 64 +++++ include/hw/virtio/virtio-blk.h | 18 +- include/qapi/qmp/qerror.h | 9 - include/sysemu/block-backend.h | 1 + monitor.c | 16 +- nbd.c | 42 ++-- qapi/block-core.json | 60 ++++- qemu-img.c | 2 +- qemu-nbd.c | 7 +- qmp-commands.hx | 54 ++++- qmp.c | 8 +- tests/Makefile | 3 + tests/qemu-iotests/067.out | 5 + tests/qemu-iotests/083 | 3 +- tests/qemu-iotests/083.out | 81 +++---- tests/qemu-iotests/100 | 12 + tests/qemu-iotests/104 | 9 +- tests/qemu-iotests/116 | 96 ++++++++ tests/qemu-iotests/116.out | 37 +++ tests/qemu-iotests/common.filter | 1 + tests/qemu-iotests/common.rc | 2 +- tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 2 +- tests/test-write-threshold.c | 119 ++++++++++ trace-events | 1 + 55 files changed, 1602 insertions(+), 462 deletions(-) create mode 100644 block/write-threshold.c create mode 100644 include/block/write-threshold.h create mode 100755 tests/qemu-iotests/116 create mode 100644 tests/qemu-iotests/116.out create mode 100644 tests/test-write-threshold.c