Commit 53f1dfd1 authored by Fam Zheng's avatar Fam Zheng Committed by Max Reitz
Browse files

qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status 



Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-id: 1453780743-16806-8-git-send-email-famz@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent ddf4987d

block/qed.c

+3 −0
Original line number Diff line number Diff line
@@ -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 };