diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-12-06 20:24:44 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-12-22 15:05:32 +0100 |
| commit | 1a63a907507fbbcfaee3f622907ec244b7eabda8 (patch) | |
| tree | 3d99d71c98b48bbdc326b03fe6d154980a2ce0ce /block | |
| parent | 44487eb973f895d68989cf931e25f309ec9807f9 (diff) | |
| download | qemu-1a63a907507fbbcfaee3f622907ec244b7eabda8.zip qemu-1a63a907507fbbcfaee3f622907ec244b7eabda8.tar.gz qemu-1a63a907507fbbcfaee3f622907ec244b7eabda8.tar.bz2 | |
block: Keep nodes drained between reopen_queue/multiple
The bdrv_reopen*() implementation doesn't like it if the graph is
changed between queuing nodes for reopen and actually reopening them
(one of the reasons is that queuing can be recursive).
So instead of draining the device only in bdrv_reopen_multiple(),
require that callers already drained all affected nodes, and assert this
in bdrv_reopen_queue().
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/replication.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/replication.c b/block/replication.c index e41e293..b1ea3ca 100644 --- a/block/replication.c +++ b/block/replication.c @@ -394,6 +394,9 @@ static void reopen_backing_file(BlockDriverState *bs, bool writable, new_secondary_flags = s->orig_secondary_flags; } + bdrv_subtree_drained_begin(s->hidden_disk->bs); + bdrv_subtree_drained_begin(s->secondary_disk->bs); + if (orig_hidden_flags != new_hidden_flags) { reopen_queue = bdrv_reopen_queue(reopen_queue, s->hidden_disk->bs, NULL, new_hidden_flags); @@ -409,6 +412,9 @@ static void reopen_backing_file(BlockDriverState *bs, bool writable, reopen_queue, &local_err); error_propagate(errp, local_err); } + + bdrv_subtree_drained_end(s->hidden_disk->bs); + bdrv_subtree_drained_end(s->secondary_disk->bs); } static void backup_job_cleanup(BlockDriverState *bs) |