The following changes since commit b5d54bd42158b90b239bb6ce9c13072eb3a53fd2:
Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 (2013-08-29 17:21:51 -0500) are available in the git repository at: git://repo.or.cz/qemu/kevin.git for-anthony for you to fetch changes up to ca0eca91b65c34d6e5f5c77d5c18ed3de5b26139: qemu-iotests: Overlapping cluster allocations (2013-09-02 10:15:15 +0200) ---------------------------------------------------------------- Bharata B Rao (1): gluster: Abort on AIO completion failure Kevin Wolf (6): qcow2: Change default for new images to compat=1.1 block: Remove redundant assertion qapi-types.py: Split off generate_struct_fields() Revert "block: Disable driver-specific options for 1.6" qemu-iotests: Update reference output for 051 block: Remove old raw driver Laszlo Ersek (7): add skeleton for BSD licensed "raw" BlockDriver raw_bsd: emit debug events in bdrv_co_readv() and bdrv_co_writev() raw_bsd: add raw_create() raw_bsd: introduce "special members" raw_bsd: add raw_create_options raw_bsd: register bdrv_raw switch raw block driver from "raw.o" to "raw_bsd.o" Max Reitz (11): option: Add assigned flag to QEMUOptionParameter qcow2-refcount: Snapshot update for zero clusters qemu-iotests: Snapshotting zero clusters qcow2: Add corrupt bit qcow2: Metadata overlap checks qcow2: Employ metadata overlap checks qcow2-refcount: Move OFLAG_COPIED checks qcow2-refcount: Repair OFLAG_COPIED errors qcow2-refcount: Repair shared refcount blocks qcow2_check: Mark image consistent qemu-iotests: Overlapping cluster allocations Peter Maydell (1): block/qcow2.h: Avoid "1LL << 63" (shifts into sign bit) block.c | 1 - block/Makefile.objs | 2 +- block/blkdebug.c | 1 + block/gluster.c | 15 +- block/qcow2-cache.c | 17 ++ block/qcow2-cluster.c | 25 ++- block/qcow2-refcount.c | 533 ++++++++++++++++++++++++++++++++++++++++----- block/qcow2-snapshot.c | 22 ++ block/qcow2.c | 83 ++++++- block/qcow2.h | 53 ++++- block/{raw.c => raw_bsd.c} | 170 +++++++-------- blockdev.c | 143 ------------ docs/specs/qcow2.txt | 7 +- include/block/block.h | 1 + include/monitor/monitor.h | 1 + include/qemu/option.h | 1 + monitor.c | 1 + scripts/qapi-types.py | 19 +- tests/qemu-iotests/031.out | 12 +- tests/qemu-iotests/036.out | 2 +- tests/qemu-iotests/051.out | 1 - tests/qemu-iotests/060 | 111 ++++++++++ tests/qemu-iotests/060.out | 44 ++++ tests/qemu-iotests/062 | 64 ++++++ tests/qemu-iotests/062.out | 9 + tests/qemu-iotests/group | 4 +- util/qemu-option.c | 9 + 27 files changed, 1029 insertions(+), 322 deletions(-) rename block/{raw.c => raw_bsd.c} (57%) create mode 100755 tests/qemu-iotests/060 create mode 100644 tests/qemu-iotests/060.out create mode 100755 tests/qemu-iotests/062 create mode 100644 tests/qemu-iotests/062.out