[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/48] qed: Assign bs->file->bs to file in bdrv_qed_c
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 39/48] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status |
Date: |
Fri, 29 Jan 2016 18:37:45 +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 };
--
1.8.3.1
- [Qemu-devel] [PULL 24/48] blockdev: Use blk_remove_bs() in do_drive_del(), (continued)
- [Qemu-devel] [PULL 24/48] blockdev: Use blk_remove_bs() in do_drive_del(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 23/48] block: Use blk_remove_bs() in blk_delete(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 18/48] block: Add BB-BDS remove/insert notifiers, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 19/48] virtio-blk: Functions for op blocker management, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 20/48] virtio-scsi: Catch BDS-BB removal/insertion, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 25/48] block: Make bdrv_close() static, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 30/48] iotests: Add test for multiple BB on BDS tree, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 26/48] block: Add list of all BlockDriverStates, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 34/48] qcow: Assign bs->file->bs to file in qcow_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 37/48] iscsi: Assign bs to file in iscsi_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 39/48] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status,
Kevin Wolf <=
- [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