Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- Active mirror (blockdev-mirror copy-mode=write-blocking)
- bdrv_drain_*() fixes and test cases
- Fix crash with scsi-hd and drive_del
# gpg: Signature made Mon 18 Jun 2018 17:44:10 BST
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream: (35 commits)
iotests: Add test for active mirroring
block/mirror: Add copy mode QAPI interface
block/mirror: Add active mirroring
job: Add job_progress_increase_remaining()
block/mirror: Add MirrorBDSOpaque
block/dirty-bitmap: Add bdrv_dirty_iter_next_area
test-hbitmap: Add non-advancing iter_next tests
hbitmap: Add @advance param to hbitmap_iter_next()
block: Generalize should_update_child() rule
block/mirror: Use source as a BdrvChild
block/mirror: Wait for in-flight op conflicts
block/mirror: Use CoQueue to wait on in-flight ops
block/mirror: Convert to coroutines
block/mirror: Pull out mirror_perform()
block: fix QEMU crash with scsi-hd and drive_del
test-bdrv-drain: Test graph changes in drain_all section
block: Allow graph changes in bdrv_drain_all_begin/end sections
block: ignore_bds_parents parameter for drain functions
block: Move bdrv_drain_all_begin() out of coroutine context
block: Allow AIO_WAIT_WHILE with NULL ctx
...
Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- block.c 80 additions, 16 deletionsblock.c
- block/backup.c 1 addition, 1 deletionblock/backup.c
- block/block-backend.c 5 additions, 0 deletionsblock/block-backend.c
- block/dirty-bitmap.c 56 additions, 1 deletionblock/dirty-bitmap.c
- block/io.c 210 additions, 122 deletionsblock/io.c
- block/mirror.c 494 additions, 119 deletionsblock/mirror.c
- block/vvfat.c 1 addition, 0 deletionsblock/vvfat.c
- blockdev.c 8 additions, 1 deletionblockdev.c
- blockjob.c 23 additions, 0 deletionsblockjob.c
- include/block/aio-wait.h 12 additions, 13 deletionsinclude/block/aio-wait.h
- include/block/block.h 29 additions, 2 deletionsinclude/block/block.h
- include/block/block_int.h 17 additions, 1 deletioninclude/block/block_int.h
- include/block/blockjob_int.h 8 additions, 0 deletionsinclude/block/blockjob_int.h
- include/block/dirty-bitmap.h 2 additions, 0 deletionsinclude/block/dirty-bitmap.h
- include/qemu/hbitmap.h 4 additions, 1 deletioninclude/qemu/hbitmap.h
- include/qemu/job.h 15 additions, 0 deletionsinclude/qemu/job.h
- job.c 5 additions, 0 deletionsjob.c
- qapi/block-core.json 27 additions, 2 deletionsqapi/block-core.json
- tests/qemu-iotests/151 120 additions, 0 deletionstests/qemu-iotests/151
- tests/qemu-iotests/151.out 5 additions, 0 deletionstests/qemu-iotests/151.out
Loading
Please register or sign in to comment