Commit d5e6b161 authored by Michael Tokarev's avatar Michael Tokarev
Browse files

change qemu_iovec_to_buf() to match other to,from_buf functions 



It now allows specifying offset within qiov to start from and
amount of bytes to copy.  Actual implementation is just a call
to iov_to_buf().

Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 1b093c48

block.c

+1 −1
Original line number Diff line number Diff line
@@ -3408,7 +3408,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, 
    acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);



    if (is_write) {

        qemu_iovec_to_buffer(acb->qiov, acb->bounce);

        qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);

        acb->ret = bs->drv->bdrv_write(bs, sector_num, acb->bounce, nb_sectors);

    } else {

        acb->ret = bs->drv->bdrv_read(bs, sector_num, acb->bounce, nb_sectors);

block/iscsi.c

+1 −2
Original line number Diff line number Diff line
@@ -240,8 +240,7 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, 
    /* this will allow us to get rid of 'buf' completely */

    size = nb_sectors * BDRV_SECTOR_SIZE;

    acb->buf = g_malloc(size);

    qemu_iovec_to_buffer(acb->qiov, acb->buf);



    qemu_iovec_to_buf(acb->qiov, 0, acb->buf, size);



    acb->task = malloc(sizeof(struct scsi_task));

    if (acb->task == NULL) {

block/qcow.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num, 


    if (qiov->niov > 1) {

        buf = orig_buf = qemu_blockalign(bs, qiov->size);

        qemu_iovec_to_buffer(qiov, buf);

        qemu_iovec_to_buf(qiov, 0, buf, qiov->size);

    } else {

        orig_buf = NULL;

        buf = (uint8_t *)qiov->iov->iov_base;

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, 


            assert(hd_qiov.size <=

                   QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);

            qemu_iovec_to_buffer(&hd_qiov, cluster_data);

            qemu_iovec_to_buf(&hd_qiov, 0, cluster_data, hd_qiov.size);



            qcow2_encrypt_sectors(s, sector_num, cluster_data,

                cluster_data, cur_nr_sectors, 1, &s->aes_encrypt_key);

block/rbd.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriverState *bs, 
    acb->bh = NULL;



    if (cmd == RBD_AIO_WRITE) {

        qemu_iovec_to_buffer(acb->qiov, acb->bounce);

        qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);

    }



    buf = acb->bounce;