diff options
author | Max Reitz <mreitz@redhat.com> | 2019-07-03 19:28:02 +0200 |
---|---|---|
committer | Max Reitz <mreitz@redhat.com> | 2019-07-15 15:48:40 +0200 |
commit | e5182c1c57ac9aa0e9c399b9c60af3c41cff35b4 (patch) | |
tree | 04e54401d154ee49cc0c0855dccef3a9413b04c8 /block | |
parent | 95667c3be0c9f5fc62f58fe845879250f63f7d32 (diff) | |
download | qemu-e5182c1c57ac9aa0e9c399b9c60af3c41cff35b4.zip qemu-e5182c1c57ac9aa0e9c399b9c60af3c41cff35b4.tar.gz qemu-e5182c1c57ac9aa0e9c399b9c60af3c41cff35b4.tar.bz2 |
block: Add BDS.never_freeze
The commit and the mirror block job must be able to drop their filter
node at any point. However, this will not be possible if any of the
BdrvChild links to them is frozen. Therefore, we need to prevent them
from ever becoming frozen.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20190703172813.6868-2-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/commit.c | 4 | ||||
-rw-r--r-- | block/mirror.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/block/commit.c b/block/commit.c index ca7e408..2c5a6d4 100644 --- a/block/commit.c +++ b/block/commit.c @@ -298,6 +298,10 @@ void commit_start(const char *job_id, BlockDriverState *bs, if (!filter_node_name) { commit_top_bs->implicit = true; } + + /* So that we can always drop this node */ + commit_top_bs->never_freeze = true; + commit_top_bs->total_sectors = top->total_sectors; bdrv_append(commit_top_bs, top, &local_err); diff --git a/block/mirror.c b/block/mirror.c index 2fcec70..8cb75fb 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1551,6 +1551,10 @@ static BlockJob *mirror_start_job( if (!filter_node_name) { mirror_top_bs->implicit = true; } + + /* So that we can always drop this node */ + mirror_top_bs->never_freeze = true; + mirror_top_bs->total_sectors = bs->total_sectors; mirror_top_bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED; mirror_top_bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | |