[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v8 12/15] block: Use returned *file in bdrv_co_get_b
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v8 12/15] block: Use returned *file in bdrv_co_get_block_status |
Date: |
Mon, 25 Jan 2016 10:44:44 +0800 |
Now that all drivers return the right "file" pointer, we can use it.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/io.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/io.c b/block/io.c
index 0836991..d704d32 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1552,13 +1552,13 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
}
}
- if (bs->file &&
+ if (*file && *file != bs &&
(ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) &&
(ret & BDRV_BLOCK_OFFSET_VALID)) {
BlockDriverState *file2;
int file_pnum;
- ret2 = bdrv_co_get_block_status(bs->file->bs, ret >> BDRV_SECTOR_BITS,
+ ret2 = bdrv_co_get_block_status(*file, ret >> BDRV_SECTOR_BITS,
*pnum, &file_pnum, &file2);
if (ret2 >= 0) {
/* Ignore errors. This is just providing extra information, it
--
2.4.3
- Re: [Qemu-block] [PATCH v8 04/15] raw: Assign bs to file in raw_co_get_block_status, (continued)
- [Qemu-block] [PATCH v8 05/15] iscsi: Assign bs to file in iscsi_co_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 06/15] parallels: Assign bs->file->bs to file in parallels_co_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 07/15] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 08/15] sheepdog: Assign bs to file in sd_co_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 09/15] vdi: Assign bs->file->bs to file in vdi_co_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 10/15] vpc: Assign bs->file->bs to file in vpc_co_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 11/15] vmdk: Return extent's file in bdrv_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 12/15] block: Use returned *file in bdrv_co_get_block_status,
Fam Zheng <=
- [Qemu-block] [PATCH v8 13/15] qemu-img: In "map", use the returned "file" from bdrv_get_block_status, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 14/15] qemu-img: Make MapEntry a QAPI struct, Fam Zheng, 2016/01/24
- [Qemu-block] [PATCH v8 15/15] iotests: Add "qemu-img map" test for VMDK extents, Fam Zheng, 2016/01/24
- Re: [Qemu-block] [PATCH v8 00/15] qemu-img map: Allow driver to return file of the allocated block, Kevin Wolf, 2016/01/25