mirror of https://gitlab.com/qemu-project/qemu
block: Remove poll parameter from bdrv_parent_drained_begin_single()
All callers of bdrv_parent_drained_begin_single() pass poll=false now, so we don't need the parameter any more. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20221118174110.55183-16-kwolf@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
2398747128
commit
606ed756c1
4
block.c
4
block.c
|
@ -2417,7 +2417,7 @@ static void bdrv_replace_child_abort(void *opaque)
|
||||||
* new_bs drained when calling bdrv_replace_child_tran() is not a
|
* new_bs drained when calling bdrv_replace_child_tran() is not a
|
||||||
* requirement any more.
|
* requirement any more.
|
||||||
*/
|
*/
|
||||||
bdrv_parent_drained_begin_single(s->child, false);
|
bdrv_parent_drained_begin_single(s->child);
|
||||||
assert(!bdrv_parent_drained_poll_single(s->child));
|
assert(!bdrv_parent_drained_poll_single(s->child));
|
||||||
}
|
}
|
||||||
assert(s->child->quiesced_parent);
|
assert(s->child->quiesced_parent);
|
||||||
|
@ -3090,7 +3090,7 @@ static BdrvChild *bdrv_attach_child_common(BlockDriverState *child_bs,
|
||||||
* a problem, we already did this), but it will still poll until the parent
|
* a problem, we already did this), but it will still poll until the parent
|
||||||
* is fully quiesced, so it will not be negatively affected either.
|
* is fully quiesced, so it will not be negatively affected either.
|
||||||
*/
|
*/
|
||||||
bdrv_parent_drained_begin_single(new_child, false);
|
bdrv_parent_drained_begin_single(new_child);
|
||||||
bdrv_replace_child_noperm(new_child, child_bs);
|
bdrv_replace_child_noperm(new_child, child_bs);
|
||||||
|
|
||||||
BdrvAttachChildCommonState *s = g_new(BdrvAttachChildCommonState, 1);
|
BdrvAttachChildCommonState *s = g_new(BdrvAttachChildCommonState, 1);
|
||||||
|
|
|
@ -53,7 +53,7 @@ static void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore)
|
||||||
if (c == ignore) {
|
if (c == ignore) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
bdrv_parent_drained_begin_single(c, false);
|
bdrv_parent_drained_begin_single(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,9 +105,8 @@ static bool bdrv_parent_drained_poll(BlockDriverState *bs, BdrvChild *ignore,
|
||||||
return busy;
|
return busy;
|
||||||
}
|
}
|
||||||
|
|
||||||
void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)
|
void bdrv_parent_drained_begin_single(BdrvChild *c)
|
||||||
{
|
{
|
||||||
AioContext *ctx = bdrv_child_get_parent_aio_context(c);
|
|
||||||
IO_OR_GS_CODE();
|
IO_OR_GS_CODE();
|
||||||
|
|
||||||
assert(!c->quiesced_parent);
|
assert(!c->quiesced_parent);
|
||||||
|
@ -116,9 +115,6 @@ void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll)
|
||||||
if (c->klass->drained_begin) {
|
if (c->klass->drained_begin) {
|
||||||
c->klass->drained_begin(c);
|
c->klass->drained_begin(c);
|
||||||
}
|
}
|
||||||
if (poll) {
|
|
||||||
AIO_WAIT_WHILE(ctx, bdrv_parent_drained_poll_single(c));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
|
static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
|
||||||
|
|
|
@ -287,10 +287,9 @@ bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
|
||||||
/**
|
/**
|
||||||
* bdrv_parent_drained_begin_single:
|
* bdrv_parent_drained_begin_single:
|
||||||
*
|
*
|
||||||
* Begin a quiesced section for the parent of @c. If @poll is true, wait for
|
* Begin a quiesced section for the parent of @c.
|
||||||
* any pending activity to cease.
|
|
||||||
*/
|
*/
|
||||||
void bdrv_parent_drained_begin_single(BdrvChild *c, bool poll);
|
void bdrv_parent_drained_begin_single(BdrvChild *c);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* bdrv_parent_drained_poll_single:
|
* bdrv_parent_drained_poll_single:
|
||||||
|
|
Loading…
Reference in New Issue