Commit 8e8eb0a9 authored Jul 31, 2017 by Kevin Wolf

block/qapi: Remove redundant NULL check to silence Coverity



When skipping implicit nodes in bdrv_block_device_info(), we know that
bs0 is always non-NULL; initially, because it's taken from a BdrvChild
and a BdrvChild never has a NULL bs, and after the first iteration
because implicit nodes always have a backing file.

Remove the NULL check and add an assertion that the implicit node does
indeed have a backing file.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>

parent 59fa68f3

block/qapi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -145,8 +145,9 @@ BlockDeviceInfo bdrv_block_device_info(BlockBackend blk,

		/* Skip automatically inserted nodes that the user isn't aware of for
		* query-block (blk != NULL), but not for query-named-block-nodes */
		while (blk && bs0 && bs0->drv && bs0->implicit) {
		while (blk && bs0->drv && bs0->implicit) {
		bs0 = backing_bs(bs0);
		assert(bs0);
		}
		}