Commit 0b3ca76e authored Apr 04, 2019 by Alberto Garcia Committed by Max Reitz May 07, 2019

block: Assert that drv->bdrv_child_perm is set in bdrv_child_perm()



There is no need to check for this because all block drivers that have
children implement bdrv_child_perm and all callers already ensure that
bs->drv is set.

Furthermore, if this check would fail then the callers would end up
with uninitialized values for nperm and nshared.

This patch replaces the check with an assertion.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-id: 20190404112953.4058-1-berto@igalia.com
Signed-off-by: Max Reitz <mreitz@redhat.com>

parent 21205c7c

block.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1743,11 +1743,10 @@ static void bdrv_child_perm(BlockDriverState bs, BlockDriverState child_bs,
		uint64_t parent_perm, uint64_t parent_shared,
		uint64_t nperm, uint64_t nshared)
		{
		if (bs->drv && bs->drv->bdrv_child_perm) {
		assert(bs->drv && bs->drv->bdrv_child_perm);
		bs->drv->bdrv_child_perm(bs, c, role, reopen_queue,
		parent_perm, parent_shared,
		nperm, nshared);
		}
		/* TODO Take force_share from reopen_queue */
		if (child_bs && child_bs->force_share) {
		*nshared = BLK_PERM_ALL;