This pull request supersedes Kevin's pull request from Friday
(http://lists.nongnu.org/archive/html/qemu-devel/2016-01/msg06026.html).
The following changes since commit d2ea854c382d4d080de1f149167e60290108f79b:
Merge remote-tracking branch
'remotes/berrange/tags/pull-qcrypto-next-2016-02-02-1' into staging (2016-02-02
15:55:01 +0000)
are available in the git repository at:
git://github.com/XanClic/qemu.git tags/pull-block-for-peter-2016-02-02
for you to fetch changes up to 8983b670f62ab5e5e8dd2690bf8304123651bfe5:
block: qemu-iotests - add test for snapshot, commit, snapshot bug (2016-02-02
18:07:27 +0100)
----------------------------------------------------------------
Block patches
----------------------------------------------------------------
Fam Zheng (18):
vmdk: Fix converting to streamOptimized
block: Remove unused struct definition BlockFinishData
block: Add "file" output parameter to block status query functions
qcow: Assign bs->file->bs to file in qcow_co_get_block_status
qcow2: Assign bs->file->bs to file in qcow2_co_get_block_status
raw: Assign bs to file in raw_co_get_block_status
iscsi: Assign bs to file in iscsi_co_get_block_status
parallels: Assign bs->file->bs to file in parallels_co_get_block_status
qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status
sheepdog: Assign bs to file in sd_co_get_block_status
vdi: Assign bs->file->bs to file in vdi_co_get_block_status
vpc: Assign bs->file->bs to file in vpc_co_get_block_status
vmdk: Fix calculation of block status's offset
vmdk: Return extent's file in bdrv_get_block_status
block: Use returned *file in bdrv_co_get_block_status
qemu-img: In "map", use the returned "file" from bdrv_get_block_status
qemu-img: Make MapEntry a QAPI struct
iotests: Add "qemu-img map" test for VMDK extents
Jeff Cody (2):
block: set device_list.tqe_prev to NULL on BDS removal
block: qemu-iotests - add test for snapshot, commit, snapshot bug
Max Reitz (29):
block: Add blk_dev_has_tray()
blockdev: Fix 'change' for slot devices
Revert "hw/block/fdc: Implement tray status"
block/qapi: Emit tray_open only if there is a tray
iotests: Limit supported formats for 118
nbd: client_close on error in nbd_co_client_start
iotests: Rename filter_nbd to _filter_nbd in 083
iotests: Change coding style of _filter_nbd in 083
iotests: Move _filter_nbd into common.filter
iotests: Make _filter_nbd drop log lines
iotests: Make _filter_nbd support more URL types
iotests: Make redirecting qemu's stderr optional
iotests: Add test for a nonexistent NBD export
block: Release named dirty bitmaps in bdrv_close()
iotests: Add test for eject under NBD server
block: Add BB-BDS remove/insert notifiers
virtio-blk: Functions for op blocker management
virtio-scsi: Catch BDS-BB removal/insertion
nbd: Switch from close to eject notifier
block: Remove BDS close notifier
block: Use blk_remove_bs() in blk_delete()
blockdev: Use blk_remove_bs() in do_drive_del()
block: Make bdrv_close() static
block: Add list of all BlockDriverStates
blockdev: Keep track of monitor-owned BDS
block: Add blk_remove_all_bs()
block: Rewrite bdrv_close_all()
iotests: Add test for multiple BB on BDS tree
iotests: Add test for block jobs and BDS ejection
Paolo Bonzini (1):
block: acquire in bdrv_query_image_info
block.c | 114 ++++++++++++++------
block/block-backend.c | 53 ++++++++--
block/io.c | 44 +++++---
block/iscsi.c | 9 +-
block/mirror.c | 3 +-
block/parallels.c | 3 +-
block/qapi.c | 11 +-
block/qcow.c | 3 +-
block/qcow2.c | 3 +-
block/qed.c | 6 +-
block/raw-posix.c | 4 +-
block/raw_bsd.c | 4 +-
block/sheepdog.c | 5 +-
block/vdi.c | 3 +-
block/vmdk.c | 18 ++--
block/vpc.c | 4 +-
block/vvfat.c | 2 +-
blockdev-nbd.c | 40 +------
blockdev.c | 64 ++++++++++--
blockjob.c | 8 --
hw/block/dataplane/virtio-blk.c | 77 ++++++++++----
hw/block/fdc.c | 23 ++--
hw/scsi/virtio-scsi.c | 55 ++++++++++
include/block/block.h | 14 +--
include/block/block_int.h | 12 ++-
include/hw/virtio/virtio-scsi.h | 10 ++
include/sysemu/block-backend.h | 4 +-
nbd/server.c | 16 ++-
qapi/block-core.json | 34 +++++-
qemu-img.c | 84 +++++++++------
stubs/Makefile.objs | 1 +
stubs/blockdev-close-all-bdrv-states.c | 5 +
tests/fdc-test.c | 2 -
tests/qemu-iotests/059 | 10 ++
tests/qemu-iotests/059.out | 25 +++++
tests/qemu-iotests/067.out | 4 -
tests/qemu-iotests/083 | 13 +--
tests/qemu-iotests/083.out | 10 --
tests/qemu-iotests/117 | 86 +++++++++++++++
tests/qemu-iotests/117.out | 14 +++
tests/qemu-iotests/118 | 121 +++++++--------------
tests/qemu-iotests/140 | 92 ++++++++++++++++
tests/qemu-iotests/140.out | 16 +++
tests/qemu-iotests/141 | 186 +++++++++++++++++++++++++++++++++
tests/qemu-iotests/141.out | 59 +++++++++++
tests/qemu-iotests/143 | 73 +++++++++++++
tests/qemu-iotests/143.out | 7 ++
tests/qemu-iotests/144 | 114 ++++++++++++++++++++
tests/qemu-iotests/144.out | 24 +++++
tests/qemu-iotests/common.filter | 13 +++
tests/qemu-iotests/common.qemu | 15 ++-
tests/qemu-iotests/group | 5 +
52 files changed, 1302 insertions(+), 323 deletions(-)
create mode 100644 stubs/blockdev-close-all-bdrv-states.c
create mode 100755 tests/qemu-iotests/117
create mode 100644 tests/qemu-iotests/117.out
create mode 100755 tests/qemu-iotests/140
create mode 100644 tests/qemu-iotests/140.out
create mode 100755 tests/qemu-iotests/141
create mode 100644 tests/qemu-iotests/141.out
create mode 100755 tests/qemu-iotests/143
create mode 100644 tests/qemu-iotests/143.out
create mode 100755 tests/qemu-iotests/144
create mode 100644 tests/qemu-iotests/144.out
