mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: continue until base is found in bdrv_freeze_backing_chain() et al

Browse Source 
All three functions that handle the BdrvChild.frozen attribute walk
the backing chain from 'bs' to 'base' and stop either when 'base' is
found or at the end of the chain if 'base' is NULL.

However if 'base' is not found then the functions return without
errors as if it was NULL.

This is wrong: if the caller passed an incorrect parameter that means
that there is a bug in the code.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Alberto Garcia 2019-03-28 18:25:09 +02:00 committed by Kevin Wolf
parent 696aaaed57
commit 0f0998f621
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
block.c
View File

@ -4218,14 +4218,15 @@ BlockDriverState *bdrv_find_base(BlockDriverState *bs)
/* /*
* Return true if at least one of the backing links between @bs and * Return true if at least one of the backing links between @bs and
* @base is frozen. @errp is set if that's the case. * @base is frozen. @errp is set if that's the case.
* @base must be reachable from @bs, or NULL.
*/ */
bool bdrv_is_backing_chain_frozen(BlockDriverState *bs, BlockDriverState *base, bool bdrv_is_backing_chain_frozen(BlockDriverState *bs, BlockDriverState *base,
Error **errp) Error **errp)
{ {
BlockDriverState *i; BlockDriverState *i;
for (i = bs; i != base && i->backing; i = backing_bs(i)) { for (i = bs; i != base; i = backing_bs(i)) {
if (i->backing->frozen) { if (i->backing && i->backing->frozen) {
error_setg(errp, "Cannot change '%s' link from '%s' to '%s'", error_setg(errp, "Cannot change '%s' link from '%s' to '%s'",
i->backing->name, i->node_name, i->backing->name, i->node_name,
backing_bs(i)->node_name); backing_bs(i)->node_name);
@ -4240,6 +4241,7 @@ bool bdrv_is_backing_chain_frozen(BlockDriverState *bs, BlockDriverState *base,
* Freeze all backing links between @bs and @base. * Freeze all backing links between @bs and @base.
* If any of the links is already frozen the operation is aborted and * If any of the links is already frozen the operation is aborted and
* none of the links are modified. * none of the links are modified.
* @base must be reachable from @bs, or NULL.
* Returns 0 on success. On failure returns < 0 and sets @errp. * Returns 0 on success. On failure returns < 0 and sets @errp.
*/ */
int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base, int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base,
@ -4251,8 +4253,10 @@ int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base,
return -EPERM; return -EPERM;
} }
for (i = bs; i != base && i->backing; i = backing_bs(i)) { for (i = bs; i != base; i = backing_bs(i)) {
i->backing->frozen = true; if (i->backing) {
i->backing->frozen = true;
}
} }
return 0; return 0;
@ -4261,14 +4265,17 @@ int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base,
/* /*
* Unfreeze all backing links between @bs and @base. The caller must * Unfreeze all backing links between @bs and @base. The caller must
* ensure that all links are frozen before using this function. * ensure that all links are frozen before using this function.
* @base must be reachable from @bs, or NULL.
*/ */
void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *base) void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *base)
{ {
BlockDriverState *i; BlockDriverState *i;
for (i = bs; i != base && i->backing; i = backing_bs(i)) { for (i = bs; i != base; i = backing_bs(i)) {
assert(i->backing->frozen); if (i->backing) {
i->backing->frozen = false; assert(i->backing->frozen);
i->backing->frozen = false;
}
} }
} }