[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 39/50] qed: Assign bs->file->bs to file in bdrv_qe
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL v2 39/50] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status |
Date: |
Tue, 2 Feb 2016 18:35:32 +0100 |
From: Fam Zheng <address@hidden>
Reviewed-by: Eric Blake <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/qed.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/block/qed.c b/block/qed.c
index 8f6f841..404be1e 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -693,6 +693,7 @@ typedef struct {
uint64_t pos;
int64_t status;
int *pnum;
+ BlockDriverState **file;
} QEDIsAllocatedCB;
static void qed_is_allocated_cb(void *opaque, int ret, uint64_t offset, size_t
len)
@@ -704,6 +705,7 @@ static void qed_is_allocated_cb(void *opaque, int ret,
uint64_t offset, size_t l
case QED_CLUSTER_FOUND:
offset |= qed_offset_into_cluster(s, cb->pos);
cb->status = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | offset;
+ *cb->file = cb->bs->file->bs;
break;
case QED_CLUSTER_ZERO:
cb->status = BDRV_BLOCK_ZERO;
@@ -735,6 +737,7 @@ static int64_t coroutine_fn
bdrv_qed_co_get_block_status(BlockDriverState *bs,
.pos = (uint64_t)sector_num * BDRV_SECTOR_SIZE,
.status = BDRV_BLOCK_OFFSET_MASK,
.pnum = pnum,
+ .file = file,
};
QEDRequest request = { .l2_table = NULL };
--
2.7.0
- [Qemu-devel] [PULL v2 32/50] block: acquire in bdrv_query_image_info, (continued)
- [Qemu-devel] [PULL v2 32/50] block: acquire in bdrv_query_image_info, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 31/50] iotests: Add test for block jobs and BDS ejection, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 34/50] qcow: Assign bs->file->bs to file in qcow_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 35/50] qcow2: Assign bs->file->bs to file in qcow2_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 33/50] block: Add "file" output parameter to block status query functions, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 36/50] raw: Assign bs to file in raw_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 38/50] parallels: Assign bs->file->bs to file in parallels_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 37/50] iscsi: Assign bs to file in iscsi_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 40/50] sheepdog: Assign bs to file in sd_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 41/50] vdi: Assign bs->file->bs to file in vdi_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 39/50] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status,
Max Reitz <=
- [Qemu-devel] [PULL v2 42/50] vpc: Assign bs->file->bs to file in vpc_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 43/50] vmdk: Fix calculation of block status's offset, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 44/50] vmdk: Return extent's file in bdrv_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 46/50] qemu-img: In "map", use the returned "file" from bdrv_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 45/50] block: Use returned *file in bdrv_co_get_block_status, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 47/50] qemu-img: Make MapEntry a QAPI struct, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 48/50] iotests: Add "qemu-img map" test for VMDK extents, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 49/50] block: set device_list.tqe_prev to NULL on BDS removal, Max Reitz, 2016/02/02
- [Qemu-devel] [PULL v2 50/50] block: qemu-iotests - add test for snapshot, commit, snapshot bug, Max Reitz, 2016/02/02
- Re: [Qemu-devel] [PULL v2 00/50] Block patches, Peter Maydell, 2016/02/02