diff options
| author | Peter Maydell | 2017-04-07 16:23:48 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-04-07 16:23:48 +0200 |
| commit | 5daf9b3025baef10ee7b77daa003d5696b58d5dc (patch) | |
| tree | 069acb65d303c4cb21563ff732a185c9bfe3a59a /include | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20170406.0' ... (diff) | |
| parent | mirror: Fix aio context of mirror_top_bs (diff) | |
| download | qemu-5daf9b3025baef10ee7b77daa003d5696b58d5dc.tar.gz qemu-5daf9b3025baef10ee7b77daa003d5696b58d5dc.tar.xz qemu-5daf9b3025baef10ee7b77daa003d5696b58d5dc.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer fixes for 2.9.0-rc4
# gpg: Signature made Fri 07 Apr 2017 13:44:17 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# 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:
mirror: Fix aio context of mirror_top_bs
block: Assert attached child node has right aio context
block: Fix unpaired aio_disable_external in external snapshot
block: Don't check permissions for copy on read
qemu-img: img_create does not support image-opts, fix docs
iotests: Add mirror tests for orphaned source
block/mirror: Fix use-after-free
commit: Set commit_top_bs->total_sectors
commit: Set commit_top_bs->aio_context
block: Ignore guest dev permissions during incoming migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/block/block.h b/include/block/block.h index 5149260827..3e09222f5f 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -366,6 +366,8 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp); void bdrv_invalidate_cache_all(Error **errp); int bdrv_inactivate_all(void); +void blk_resume_after_migration(Error **errp); + /* Ensure contents are flushed to disk. */ int bdrv_flush(BlockDriverState *bs); int coroutine_fn bdrv_co_flush(BlockDriverState *bs); |