The following changes since commit 67a708406221f476c0f8fa60c192c186150c5185:
Merge remote-tracking branch
'remotes/berrange/tags/pull-io-channel-base-2015-12-18-1' into staging
(2015-12-18 12:42: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 9d4a6cf0ea471fb5aeaba9360fec863ef8a0ab44:
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-18'
into queue-block (2015-12-18 14:40:35 +0100)
----------------------------------------------------------------
Block layer patches
----------------------------------------------------------------
Bo Tu (3):
qemu-iotests: refine common.config
qemu-iotests: s390x: fix test 051
qemu-iotests: s390x: fix test 068
Denis V. Lunev (1):
qcow2: insert assert into qcow2_get_specific_info()
Fam Zheng (2):
block: Remove prototype of bdrv_swap from header
iotests: Update comments for bdrv_swap() in 094
John Snow (8):
iotests: 124: Split into two test classes
iotests: 124: move incremental failure test
iotests: 124: don't reopen qcow2
block/qapi: do not redundantly print "actual path"
block/qapi: always report full_backing_filename
block/qapi: explicitly warn if !has_full_backing_filename
qemu-img: abort when full_backing_filename not present
block/qapi: allow best-effort query
Kevin Wolf (23):
qcow2: Add .bdrv_join_options callback
block: Fix reopen with semantically overlapping options
mirror: Error out when a BDS would get two BBs
block: Allow references for backing files
block: Consider all block layer options in append_open_options
block: Exclude nested options only for children in append_open_options()
block: Pass driver-specific options to .bdrv_refresh_filename()
block: Keep "driver" in bs->options
block: Allow specifying child options in reopen
block: reopen: Document option precedence and refactor accordingly
block: Add infrastructure for option inheritance
block: Split out parse_json_protocol()
block: Introduce bs->explicit_options
blockdev: Set 'format' indicates non-empty drive
qemu-iotests: Remove cache mode test without medium
block: reopen: Extract QemuOpts for generic block layer options
block: Move cache options into options QDict
blkdebug: Enable reopen
qemu-iotests: Try setting cache mode for children
qemu-iotests: Test cache mode option inheritance
qemu-iotests: Test reopen with node-name/driver options
raw-posix: Make aio=native option binding
Merge remote-tracking branch
'mreitz/tags/pull-block-for-kevin-2015-12-18' into queue-block
Max Reitz (10):
progress: Allow regressing progress
block: Add opaque value to the amend CB
qcow2: Use error_report() in qcow2_amend_options()
qcow2: Use abort() instead of assert(false)
qcow2: Split upgrade/downgrade paths for amend
qcow2: Use intermediate helper CB for amend
qcow2: Add function for refcount order amendment
qcow2: Invoke refcount order amendment function
qcow2: Point to amend function in check
iotests: Extend test 112 for qemu-img amend
Paolo Bonzini (2):
block: use drained section around bdrv_snapshot_delete
block: fix bdrv_ioctl called from coroutine
block.c | 463 ++++++++++++++++++-----
block/blkdebug.c | 24 +-
block/blkverify.c | 2 +-
block/io.c | 7 +-
block/mirror.c | 30 +-
block/nbd.c | 10 +-
block/qapi.c | 19 +-
block/qcow2-cluster.c | 14 +-
block/qcow2-refcount.c | 450 +++++++++++++++++++++++
block/qcow2.c | 229 ++++++++++--
block/qcow2.h | 7 +-
block/quorum.c | 2 +-
block/raw-posix.c | 20 +-
block/snapshot.c | 23 +-
blockdev.c | 57 +--
include/block/block.h | 9 +-
include/block/block_int.h | 11 +-
qemu-img.c | 10 +-
tests/hd-geo-test.c | 4 +-
tests/qemu-iotests/043.out | 2 +
tests/qemu-iotests/051 | 99 +++--
tests/qemu-iotests/051.out | 192 +++++-----
tests/qemu-iotests/051.pc.out | 482 ++++++++++++++++++++++++
tests/qemu-iotests/061.out | 14 +-
tests/qemu-iotests/068 | 14 +-
tests/qemu-iotests/094 | 8 +-
tests/qemu-iotests/110.out | 5 +-
tests/qemu-iotests/112 | 109 ++++++
tests/qemu-iotests/112.out | 71 ++++
tests/qemu-iotests/124 | 148 ++++----
tests/qemu-iotests/133 | 90 +++++
tests/qemu-iotests/133.out | 22 ++
tests/qemu-iotests/142 | 354 ++++++++++++++++++
tests/qemu-iotests/142.out | 773 +++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/common.config | 9 +-
tests/qemu-iotests/group | 2 +
tests/qemu-iotests/iotests.py | 4 +-
util/qemu-progress.c | 3 +-
38 files changed, 3326 insertions(+), 466 deletions(-)
create mode 100644 tests/qemu-iotests/051.pc.out
create mode 100755 tests/qemu-iotests/133
create mode 100644 tests/qemu-iotests/133.out
create mode 100755 tests/qemu-iotests/142
create mode 100644 tests/qemu-iotests/142.out
