The following changes since commit e40830afa1cff3ffdc37bdfdd40d80860074636c:
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2014-10-22-tag' into staging (2014-10-22 21:42:33 +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 d4db399b8be286fe471bbc9edf8ec22d8feac4d4: Merge remote-tracking branch 'mreitz/block' into queue-block (2014-10-23 19:55:55 +0200) ---------------------------------------------------------------- Block patches ---------------------------------------------------------------- Kevin Wolf (2): MAINTAINERS: qemu-iotests belongs to the block layer Merge remote-tracking branch 'mreitz/block' into queue-block Max Reitz (27): block/vdi: Use {DIV_,}ROUND_UP block: Add qemu_{,try_}blockalign0() qcow2: Calculate refcount block entry count qcow2: Fix leaks in dirty images qcow2: Split qcow2_check_refcounts() qcow2: Use sizeof(**refcount_table) qcow2: Pull check_refblocks() up qcow2: Use int64_t for in-memory reftable size qcow2: Split fail code in L1 and L2 checks qcow2: Let inc_refcounts() return -errno qcow2: Let inc_refcounts() resize the reftable qcow2: Reuse refcount table in calculate_refcounts() qcow2: Fix refcount blocks beyond image end qcow2: Do not perform potentially damaging repairs qcow2: Rebuild refcount structure during check qcow2: Clean up after refcount rebuild iotests: Fix test outputs iotests: Add test for potentially damaging repairs qcow2: Drop REFCOUNT_SHIFT docs/qcow2: Correct refcount_block_entries docs/qcow2: Limit refcount_order to [0, 6] block: Respect underlying file's EOF qemu-io: Respect early image end for map iotests: Add test for map commands qcow2: Do not overflow when writing an L1 sector iotests: Add test for qcow2 L1 table update qemu-img: Print error if check failed Paolo Bonzini (2): MAINTAINERS: add aio to block layer MAINTAINERS: add the image fuzzer to the block layer Peter Lieven (1): block: qemu-iotests change _supported_proto to file once more. Roger Pau Monne (1): block: char devices on FreeBSD are not behind a pager MAINTAINERS | 4 + block.c | 31 +- block/qcow2-cluster.c | 6 +- block/qcow2-refcount.c | 873 ++++++++++++++++++++++++++++++++------------- block/qcow2.c | 7 +- block/qcow2.h | 4 +- block/raw-posix.c | 26 +- block/vdi.c | 9 +- docs/specs/qcow2.txt | 3 +- include/block/block.h | 2 + qemu-img.c | 21 +- qemu-io-cmds.c | 5 +- tests/qemu-iotests/039.out | 10 +- tests/qemu-iotests/060.out | 10 +- tests/qemu-iotests/061.out | 18 +- tests/qemu-iotests/075 | 2 +- tests/qemu-iotests/076 | 2 +- tests/qemu-iotests/078 | 2 +- tests/qemu-iotests/079 | 2 +- tests/qemu-iotests/080 | 2 +- tests/qemu-iotests/081 | 2 +- tests/qemu-iotests/082 | 2 +- tests/qemu-iotests/084 | 2 +- tests/qemu-iotests/086 | 2 +- tests/qemu-iotests/088 | 2 +- tests/qemu-iotests/090 | 2 +- tests/qemu-iotests/092 | 2 +- tests/qemu-iotests/102 | 64 ++++ tests/qemu-iotests/102.out | 10 + tests/qemu-iotests/103 | 2 +- tests/qemu-iotests/107 | 61 ++++ tests/qemu-iotests/107.out | 10 + tests/qemu-iotests/108 | 141 ++++++++ tests/qemu-iotests/108.out | 110 ++++++ tests/qemu-iotests/group | 3 + 35 files changed, 1148 insertions(+), 306 deletions(-) create mode 100755 tests/qemu-iotests/102 create mode 100644 tests/qemu-iotests/102.out create mode 100755 tests/qemu-iotests/107 create mode 100644 tests/qemu-iotests/107.out create mode 100755 tests/qemu-iotests/108 create mode 100644 tests/qemu-iotests/108.out