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

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

Ideally, the vhdx 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 04a11d87

block/vhdx.c

+6 −6
Original line number Diff line number Diff line
@@ -1127,9 +1127,9 @@ static coroutine_fn int vhdx_co_readv(BlockDriverState *bs, int64_t sector_num, 
                break;

            case PAYLOAD_BLOCK_FULLY_PRESENT:

                qemu_co_mutex_unlock(&s->lock);

                ret = bdrv_co_readv(bs->file,

                                    sinfo.file_offset >> BDRV_SECTOR_BITS,

                                    sinfo.sectors_avail, &hd_qiov);

                ret = bdrv_co_preadv(bs->file, sinfo.file_offset,

                                     sinfo.sectors_avail * BDRV_SECTOR_SIZE,

                                     &hd_qiov, 0);

                qemu_co_mutex_lock(&s->lock);

                if (ret < 0) {

                    goto exit;
@@ -1349,9 +1349,9 @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num, 
                }

                /* block exists, so we can just overwrite it */

                qemu_co_mutex_unlock(&s->lock);

                ret = bdrv_co_writev(bs->file,

                                    sinfo.file_offset >> BDRV_SECTOR_BITS,

                                    sectors_to_write, &hd_qiov);

                ret = bdrv_co_pwritev(bs->file, sinfo.file_offset,

                                      sectors_to_write * BDRV_SECTOR_SIZE,

                                      &hd_qiov, 0);

                qemu_co_mutex_lock(&s->lock);

                if (ret < 0) {

                    goto error_bat_restore;