commit 9f4ed6fbd264a7c097590d830dcfd93996a80acb
author Alberto Garcia <berto@igalia.com> Mon Oct 26 16:46:49 2015 +0200
committer Kevin Wolf <kwolf@redhat.com> Wed Nov 11 16:22:46 2015 +0100
tree 3068941508fac59b2bf25e14689deb758efd618a
parent 3c07587d49458341510360557c849e93e9afaf59

block: Don't call blk_bs() twice in bdrv_lookup_bs()

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block.c

diff --git a/block.c b/block.c
index e9f40dc..eb8158a 100644
--- a/block.c
+++ b/block.c
@@ -2683,12 +2683,12 @@
         blk = blk_by_name(device);
 
         if (blk) {
-            if (!blk_bs(blk)) {
+            bs = blk_bs(blk);
+            if (!bs) {
                 error_setg(errp, "Device '%s' has no medium", device);
-                return NULL;
             }
 
-            return blk_bs(blk);
+            return bs;
         }
     }