Commit d08c2a24 authored by Eric Blake's avatar Eric Blake Committed by Kevin Wolf
Browse files

parallels: Switch to byte-based calls 



We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the last few sector-based calls
into the block layer from the parallels driver.

Ideally, the parallels driver should switch to doing everything
byte-based, but that's a more invasive change that requires a
bit more auditing.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarDenis V. Lunev <den@openvz.org>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent c436e3d0

block/parallels.c

+10 −6
Original line number Diff line number Diff line
@@ -227,14 +227,15 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num, 
        };

        qemu_iovec_init_external(&qiov, &iov, 1);



        ret = bdrv_co_readv(bs->backing, idx * s->tracks, nb_cow_sectors,

                            &qiov);

        ret = bdrv_co_preadv(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,

                             nb_cow_bytes, &qiov, 0);

        if (ret < 0) {

            qemu_vfree(iov.iov_base);

            return ret;

        }



        ret = bdrv_co_writev(bs->file, s->data_end, nb_cow_sectors, &qiov);

        ret = bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE,

                              nb_cow_bytes, &qiov, 0);

        qemu_vfree(iov.iov_base);

        if (ret < 0) {

            return ret;
@@ -340,7 +341,8 @@ static coroutine_fn int parallels_co_writev(BlockDriverState *bs, 
        qemu_iovec_reset(&hd_qiov);

        qemu_iovec_concat(&hd_qiov, qiov, bytes_done, nbytes);



        ret = bdrv_co_writev(bs->file, position, n, &hd_qiov);

        ret = bdrv_co_pwritev(bs->file, position * BDRV_SECTOR_SIZE, nbytes,

                              &hd_qiov, 0);

        if (ret < 0) {

            break;

        }
@@ -379,7 +381,8 @@ static coroutine_fn int parallels_co_readv(BlockDriverState *bs, 


        if (position < 0) {

            if (bs->backing) {

                ret = bdrv_co_readv(bs->backing, sector_num, n, &hd_qiov);

                ret = bdrv_co_preadv(bs->backing, sector_num * BDRV_SECTOR_SIZE,

                                     nbytes, &hd_qiov, 0);

                if (ret < 0) {

                    break;

                }
@@ -387,7 +390,8 @@ static coroutine_fn int parallels_co_readv(BlockDriverState *bs, 
                qemu_iovec_memset(&hd_qiov, 0, 0, nbytes);

            }

        } else {

            ret = bdrv_co_readv(bs->file, position, n, &hd_qiov);

            ret = bdrv_co_preadv(bs->file, position * BDRV_SECTOR_SIZE, nbytes,

                                 &hd_qiov, 0);

            if (ret < 0) {

                break;

            }