[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 44/48] vmdk: Return extent's file in bdrv_get_block_s
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 44/48] vmdk: Return extent's file in bdrv_get_block_status |
Date: |
Fri, 29 Jan 2016 18:37:50 +0100 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/vmdk.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 9d5a18a..a8db5d9 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1291,12 +1291,12 @@ static int64_t coroutine_fn
vmdk_co_get_block_status(BlockDriverState *bs,
break;
case VMDK_OK:
ret = BDRV_BLOCK_DATA;
- if (extent->file == bs->file && !extent->compressed) {
+ if (!extent->compressed) {
ret |= BDRV_BLOCK_OFFSET_VALID;
ret |= (offset + (index_in_cluster << BDRV_SECTOR_BITS))
& BDRV_BLOCK_OFFSET_MASK;
}
-
+ *file = extent->file->bs;
break;
}
--
1.8.3.1
- [Qemu-devel] [PULL 32/48] block: acquire in bdrv_query_image_info, (continued)
- [Qemu-devel] [PULL 32/48] block: acquire in bdrv_query_image_info, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 35/48] qcow2: Assign bs->file->bs to file in qcow2_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 29/48] block: Rewrite bdrv_close_all(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 27/48] blockdev: Keep track of monitor-owned BDS, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 36/48] raw: Assign bs to file in raw_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 41/48] vdi: Assign bs->file->bs to file in vdi_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 28/48] block: Add blk_remove_all_bs(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 40/48] sheepdog: Assign bs to file in sd_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 38/48] parallels: Assign bs->file->bs to file in parallels_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 42/48] vpc: Assign bs->file->bs to file in vpc_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 44/48] vmdk: Return extent's file in bdrv_get_block_status,
Kevin Wolf <=
- [Qemu-devel] [PULL 33/48] block: Add "file" output parameter to block status query functions, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 31/48] iotests: Add test for block jobs and BDS ejection, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 47/48] qemu-img: Make MapEntry a QAPI struct, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 43/48] vmdk: Fix calculation of block status's offset, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 46/48] qemu-img: In "map", use the returned "file" from bdrv_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 48/48] iotests: Add "qemu-img map" test for VMDK extents, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 45/48] block: Use returned *file in bdrv_co_get_block_status, Kevin Wolf, 2016/01/29
- Re: [Qemu-devel] [PULL 00/48] Block patches, Peter Maydell, 2016/01/29