[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 42/48] vpc: Assign bs->file->bs to file in vpc_co_get
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 42/48] vpc: Assign bs->file->bs to file in vpc_co_get_block_status |
Date: |
Fri, 29 Jan 2016 18:37:48 +0100 |
From: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block/vpc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/block/vpc.c b/block/vpc.c
index a070307..f504536 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -589,6 +589,7 @@ static int64_t coroutine_fn
vpc_co_get_block_status(BlockDriverState *bs,
if (be32_to_cpu(footer->type) == VHD_FIXED) {
*pnum = nb_sectors;
+ *file = bs->file->bs;
return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_DATA |
(sector_num << BDRV_SECTOR_BITS);
}
@@ -610,6 +611,7 @@ static int64_t coroutine_fn
vpc_co_get_block_status(BlockDriverState *bs,
/* *pnum can't be greater than one block for allocated
* sectors since there is always a bitmap in between. */
if (allocated) {
+ *file = bs->file->bs;
return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | start;
}
if (nb_sectors == 0) {
--
1.8.3.1
- [Qemu-block] [PULL 36/48] raw: Assign bs to file in raw_co_get_block_status, (continued)
- [Qemu-block] [PULL 36/48] raw: Assign bs to file in raw_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 40/48] sheepdog: Assign bs to file in sd_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 39/48] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 41/48] vdi: Assign bs->file->bs to file in vdi_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 43/48] vmdk: Fix calculation of block status's offset, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 45/48] block: Use returned *file in bdrv_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 44/48] vmdk: Return extent's file in bdrv_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 46/48] qemu-img: In "map", use the returned "file" from bdrv_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 47/48] qemu-img: Make MapEntry a QAPI struct, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 48/48] iotests: Add "qemu-img map" test for VMDK extents, Kevin Wolf, 2016/01/29
- [Qemu-block] [PULL 42/48] vpc: Assign bs->file->bs to file in vpc_co_get_block_status,
Kevin Wolf <=
- Re: [Qemu-block] [Qemu-devel] [PULL 00/48] Block patches, Peter Maydell, 2016/01/29