block: bdrv_reopen_parse_backing(): don't check aio context
We don't need this check: bdrv_set_backing_noperm() will do it anyway (actually in bdrv_attach_child_common()). Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20210610120537.196183-4-vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
e9238278c2
commit
fd26b8a089
33
block.c
33
block.c
|
@ -4215,29 +4215,6 @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool bdrv_reopen_can_attach(BlockDriverState *parent,
|
|
||||||
BdrvChild *child,
|
|
||||||
BlockDriverState *new_child,
|
|
||||||
Error **errp)
|
|
||||||
{
|
|
||||||
AioContext *parent_ctx = bdrv_get_aio_context(parent);
|
|
||||||
AioContext *child_ctx = bdrv_get_aio_context(new_child);
|
|
||||||
GSList *ignore;
|
|
||||||
bool ret;
|
|
||||||
|
|
||||||
ignore = g_slist_prepend(NULL, child);
|
|
||||||
ret = bdrv_can_set_aio_context(new_child, parent_ctx, &ignore, NULL);
|
|
||||||
g_slist_free(ignore);
|
|
||||||
if (ret) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
ignore = g_slist_prepend(NULL, child);
|
|
||||||
ret = bdrv_can_set_aio_context(parent, child_ctx, &ignore, errp);
|
|
||||||
g_slist_free(ignore);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Take a BDRVReopenState and check if the value of 'backing' in the
|
* Take a BDRVReopenState and check if the value of 'backing' in the
|
||||||
* reopen_state->options QDict is valid or not.
|
* reopen_state->options QDict is valid or not.
|
||||||
|
@ -4289,16 +4266,6 @@ static int bdrv_reopen_parse_backing(BDRVReopenState *reopen_state,
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Check AioContext compatibility so that the bdrv_set_backing_hd() call in
|
|
||||||
* bdrv_reopen_commit() won't fail.
|
|
||||||
*/
|
|
||||||
if (new_backing_bs) {
|
|
||||||
if (!bdrv_reopen_can_attach(bs, bs->backing, new_backing_bs, errp)) {
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ensure that @bs can really handle backing files, because we are
|
* Ensure that @bs can really handle backing files, because we are
|
||||||
* about to give it one (or swap the existing one)
|
* about to give it one (or swap the existing one)
|
||||||
|
|
Loading…
Reference in New Issue