qemu-block
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-block] [PATCH v5 12/15] block: Remove the "bs->file" test in bdrv_


From: Fam Zheng
Subject: [Qemu-block] [PATCH v5 12/15] block: Remove the "bs->file" test in bdrv_co_get_block_status
Date: Tue, 5 Jan 2016 16:11:13 +0800

Now that all drivers return the right "file" pointer, we can remove this
check.

Signed-off-by: Fam Zheng <address@hidden>
---
 block/io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/io.c b/block/io.c
index 492c291..1ca4e61 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1550,7 +1550,7 @@ static int64_t coroutine_fn 
bdrv_co_get_block_status(BlockDriverState *bs,
         }
     }
 
-    if (bs->file && *file && *file != bs &&
+    if (*file && *file != bs &&
         (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) &&
         (ret & BDRV_BLOCK_OFFSET_VALID)) {
         BlockDriverState *file2;
-- 
2.4.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]