diff options
author | Kevin Wolf <kwolf@redhat.com> | 2019-03-15 12:15:16 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2019-03-19 15:49:29 +0100 |
commit | 2345bde647a179ac88723e8e0c2fc1643b3a7a7e (patch) | |
tree | 11ed9c2d64fb45ed6e2c386a5ad87655df318fa3 | |
parent | b69864e5a8c7b762e94d1bfd170b8774b28ab993 (diff) | |
download | qemu-2345bde647a179ac88723e8e0c2fc1643b3a7a7e.zip qemu-2345bde647a179ac88723e8e0c2fc1643b3a7a7e.tar.gz qemu-2345bde647a179ac88723e8e0c2fc1643b3a7a7e.tar.bz2 |
block: Silence Coverity in bdrv_drop_intermediate()
Coverity doesn't like that the return value of bdrv_check_update_perm()
stays unused only in this place (CID 1399710).
Even if checking local_err should be equivalent to checking ret < 0,
let's switch to using the return value to be more consistent (and in
case of a bug somewhere down the call chain, forgetting to assign errp
is more likely than returning 0 for an error case).
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r-- | block.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -4350,11 +4350,10 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, QLIST_FOREACH_SAFE(c, &top->parents, next_parent, next) { /* Check whether we are allowed to switch c from top to base */ GSList *ignore_children = g_slist_prepend(NULL, c); - bdrv_check_update_perm(base, NULL, c->perm, c->shared_perm, - ignore_children, &local_err); + ret = bdrv_check_update_perm(base, NULL, c->perm, c->shared_perm, + ignore_children, &local_err); g_slist_free(ignore_children); - if (local_err) { - ret = -EPERM; + if (ret < 0) { error_report_err(local_err); goto exit; } |