Commit c2bdd990 authored by Frediano Ziglio's avatar Frediano Ziglio Committed by Kevin Wolf
Browse files

qcow2: remove cluster_offset from QCowAIOCB 



Signed-off-by: default avatarFrediano Ziglio <freddy77@gmail.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent c2271403

block/qcow2.c

+11 −11
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ typedef struct QCowAIOCB { 
    QEMUIOVector *qiov;

    int remaining_sectors;

    uint64_t bytes_done;

    uint64_t cluster_offset;

    uint8_t *cluster_data;

    QEMUIOVector hd_qiov;

} QCowAIOCB;
@@ -398,6 +397,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) 
    int index_in_cluster, n1;

    int ret;

    int cur_nr_sectors; /* number of sectors in current iteration */

    uint64_t cluster_offset = 0;



    if (acb->remaining_sectors == 0) {

        /* request completed */
@@ -412,7 +412,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) 
    }



    ret = qcow2_get_cluster_offset(bs, acb->sector_num << 9,

        &cur_nr_sectors, &acb->cluster_offset);

        &cur_nr_sectors, &cluster_offset);

    if (ret < 0) {

        return ret;

    }
@@ -423,7 +423,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) 
    qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,

        cur_nr_sectors * 512);



    if (!acb->cluster_offset) {

    if (!cluster_offset) {



        if (bs->backing_hd) {

            /* read from the base image */
@@ -443,9 +443,9 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) 
            /* Note: in this case, no need to wait */

            qemu_iovec_memset(&acb->hd_qiov, 0, 512 * cur_nr_sectors);

        }

    } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {

    } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) {

        /* add AIO support for compressed blocks ? */

        ret = qcow2_decompress_cluster(bs, acb->cluster_offset);

        ret = qcow2_decompress_cluster(bs, cluster_offset);

        if (ret < 0) {

            return ret;

        }
@@ -454,7 +454,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) 
            s->cluster_cache + index_in_cluster * 512,

            512 * cur_nr_sectors);

    } else {

        if ((acb->cluster_offset & 511) != 0) {

        if ((cluster_offset & 511) != 0) {

            return -EIO;

        }
@@ -478,7 +478,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) 
        BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);

        qemu_co_mutex_unlock(&s->lock);

        ret = bdrv_co_readv(bs->file,

                            (acb->cluster_offset >> 9) + index_in_cluster,

                            (cluster_offset >> 9) + index_in_cluster,

                            cur_nr_sectors, &acb->hd_qiov);

        qemu_co_mutex_lock(&s->lock);

        if (ret < 0) {
@@ -516,7 +516,6 @@ static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num, 


    acb->bytes_done = 0;

    acb->remaining_sectors = nb_sectors;

    acb->cluster_offset = 0;

    return acb;

}
@@ -568,6 +567,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) 
    int ret;

    int cur_nr_sectors; /* number of sectors in current iteration */

    QCowL2Meta l2meta;

    uint64_t cluster_offset;



    l2meta.nb_clusters = 0;

    qemu_co_queue_init(&l2meta.dependent_requests);
@@ -589,8 +589,8 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) 
        return ret;

    }



    acb->cluster_offset = l2meta.cluster_offset;

    assert((acb->cluster_offset & 511) == 0);

    cluster_offset = l2meta.cluster_offset;

    assert((cluster_offset & 511) == 0);



    qemu_iovec_reset(&acb->hd_qiov);

    qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,
@@ -616,7 +616,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) 
    BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);

    qemu_co_mutex_unlock(&s->lock);

    ret = bdrv_co_writev(bs->file,

                         (acb->cluster_offset >> 9) + index_in_cluster,

                         (cluster_offset >> 9) + index_in_cluster,

                         cur_nr_sectors, &acb->hd_qiov);

    qemu_co_mutex_lock(&s->lock);

    if (ret < 0) {