diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-07-22 15:33:43 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-08-16 10:25:16 +0200 |
| commit | 637d54a5f3a1965fa6aea9e41c4f84abf7a36de9 (patch) | |
| tree | f4b69897939b4819390aa4da545912e3098934d5 | |
| parent | e444fa83126d56f3feafe3c3397c149cac82ce96 (diff) | |
| download | focaccia-qemu-637d54a5f3a1965fa6aea9e41c4f84abf7a36de9.tar.gz focaccia-qemu-637d54a5f3a1965fa6aea9e41c4f84abf7a36de9.zip | |
block: Keep subtree drained in drop_intermediate
bdrv_drop_intermediate() calls BdrvChildRole.update_filename(). That may poll, thus changing the graph, which potentially breaks the QLIST_FOREACH_SAFE() loop. Just keep the whole subtree drained. This is probably the right thing to do anyway (dropping nodes while the subtree is not drained seems wrong). Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block.c b/block.c index 6db8ecd62b..df3407934b 100644 --- a/block.c +++ b/block.c @@ -4491,6 +4491,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, int ret = -EIO; bdrv_ref(top); + bdrv_subtree_drained_begin(top); if (!top->drv || !base->drv) { goto exit; @@ -4562,6 +4563,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, ret = 0; exit: + bdrv_subtree_drained_end(top); bdrv_unref(top); return ret; } |