diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-07-31 14:43:19 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-08-01 18:09:33 +0200 |
| commit | 8e8eb0a9035e5b6c6447c82138570e388282cfa2 (patch) | |
| tree | 934230f997739bcabfeab98a360a8f42460010af /block | |
| parent | 59fa68f3f39cc596f93205f0862c8978c503f2c8 (diff) | |
| download | qemu-8e8eb0a9035e5b6c6447c82138570e388282cfa2.zip qemu-8e8eb0a9035e5b6c6447c82138570e388282cfa2.tar.gz qemu-8e8eb0a9035e5b6c6447c82138570e388282cfa2.tar.bz2 | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qapi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/qapi.c b/block/qapi.c index d2b18ee..5f1a71f 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -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); } } |