From: Kevin Wolf <kwolf@redhat.com>
Date: Mon, 31 Jul 2017 12:43:19 +0000 (+0200)
Subject: block/qapi: Remove redundant NULL check to silence Coverity
X-Git-Tag: v2.10.0-rc1~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e8eb0a9035e5b6c6447c82138570e388282cfa2;p=thirdparty%2Fqemu.git

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>
---

diff --git a/block/qapi.c b/block/qapi.c
index d2b18ee9df7..5f1a71f5d27 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);
         }
     }