The following changes since commit dcf848c478dd8765bd4f746fc4e80eaad44cf87d:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150316' into staging (2015-03-16 13:56:10 +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 47aced5078e13d6c1f4fbb59616654e577af8aaa: Merge remote-tracking branch 'mreitz/block' into queue-block (2015-03-16 17:11:12 +0100) ---------------------------------------------------------------- Block patches for 2.3-rc0 ---------------------------------------------------------------- Fam Zheng (4): monitor: Convert bdrv_find to blk_by_name migration: Convert bdrv_find to blk_by_name blockdev: Convert bdrv_find to blk_by_name block: Drop bdrv_find Kevin Wolf (2): vpc: Ignore geometry for large images Merge remote-tracking branch 'mreitz/block' into queue-block Markus Armbruster (5): iotests: Update 051's reference output qemu-img: Fix convert, amend error messages for unknown options block: Deprecate QCOW/QCOW2 encryption block: Fix block-set-write-threshold not to use funky error class qemu-img: Avoid qerror_report_err() outside QMP handlers, again Max Reitz (3): qcow2: Respect new_block in alloc_refcount_block() iotests: Add tests for refcount table growth iotests: Test non-self-referential qcow2 refblocks Peter Lieven (4): block/vpc: optimize vpc_co_get_block_status block/vpc: make calculate_geometry spec conform block/vpc: rename footer->size -> footer->current_size block/vpc: remove disabled code from get_sector_offset block.c | 16 +++---- block/qcow2-refcount.c | 16 ++++++- block/vpc.c | 106 ++++++++++++++++----------------------------- block/write-threshold.c | 2 +- blockdev.c | 92 +++++++++++++++++++++++++-------------- include/block/block.h | 1 - migration/block.c | 7 ++- monitor.c | 9 ++-- qapi/block-core.json | 4 -- qemu-doc.texi | 11 ++--- qemu-img.c | 12 ++--- tests/qemu-iotests/049.out | 6 +++ tests/qemu-iotests/051.out | 4 +- tests/qemu-iotests/061.out | 1 - tests/qemu-iotests/087.out | 18 ++++++++ tests/qemu-iotests/115 | 95 ++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/115.out | 8 ++++ tests/qemu-iotests/121 | 102 +++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/121.out | 23 ++++++++++ tests/qemu-iotests/group | 2 + 20 files changed, 393 insertions(+), 142 deletions(-) create mode 100755 tests/qemu-iotests/115 create mode 100644 tests/qemu-iotests/115.out create mode 100755 tests/qemu-iotests/121 create mode 100644 tests/qemu-iotests/121.out