summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-01-04 15:59:14 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2017-01-24 23:26:53 +0300
commit7ad2757feffd13b8000826ae3df2a3bc929d688d (patch)
treef02d3d4e9d5af08506902c85b1862668c253e812
parent9ed2690354e65a87b830f197cac0138e842f989e (diff)
downloadfocaccia-qemu-7ad2757feffd13b8000826ae3df2a3bc929d688d.tar.gz
focaccia-qemu-7ad2757feffd13b8000826ae3df2a3bc929d688d.zip
block: remove dead check
options must be non-NULL here, because a NULL value is replaced with
qdict_new earlier in the function.  Reported by Coverity.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--block.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block.c b/block.c
index 39ddea3411..a0346c80c6 100644
--- a/block.c
+++ b/block.c
@@ -1851,7 +1851,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
     bdrv_refresh_filename(bs);
 
     /* Check if any unknown options were used */
-    if (options && (qdict_size(options) != 0)) {
+    if (qdict_size(options) != 0) {
         const QDictEntry *entry = qdict_first(options);
         if (flags & BDRV_O_PROTOCOL) {
             error_setg(errp, "Block protocol '%s' doesn't support the option "