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

replication: 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 replication driver.

Ideally, the replication 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 avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 609841a3

block/replication.c

+8 −6
Original line number Diff line number Diff line
@@ -246,13 +246,14 @@ static coroutine_fn int replication_co_readv(BlockDriverState *bs, 
        backup_cow_request_begin(&req, child->bs->job,

                                 sector_num * BDRV_SECTOR_SIZE,

                                 remaining_bytes);

        ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors,

                            qiov);

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

                             remaining_bytes, qiov, 0);

        backup_cow_request_end(&req);

        goto out;

    }



    ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors, qiov);

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

                         remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);

out:

    return replication_return_value(s, ret);

}
@@ -279,8 +280,8 @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs, 
    }



    if (ret == 0) {

        ret = bdrv_co_writev(top, sector_num,

                             remaining_sectors, qiov);

        ret = bdrv_co_pwritev(top, sector_num * BDRV_SECTOR_SIZE,

                              remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);

        return replication_return_value(s, ret);

    }
@@ -306,7 +307,8 @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs, 
        qemu_iovec_concat(&hd_qiov, qiov, bytes_done, count);



        target = ret ? top : base;

        ret = bdrv_co_writev(target, sector_num, n, &hd_qiov);

        ret = bdrv_co_pwritev(target, sector_num * BDRV_SECTOR_SIZE,

                              n * BDRV_SECTOR_SIZE, &hd_qiov, 0);

        if (ret < 0) {

            goto out1;

        }