Commit 41ae31e3 authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: Use BDRV_REQUEST_MAX_BYTES instead of BDRV_REQUEST_MAX_SECTORS 



There are a few places in which we turn a number of bytes into sectors
in order to compare the result against BDRV_REQUEST_MAX_SECTORS
instead of using BDRV_REQUEST_MAX_BYTES directly.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent b6c24694

block/io.c

+3 −3
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self) 
static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,

                                   size_t size)

{

    if (size > BDRV_REQUEST_MAX_SECTORS << BDRV_SECTOR_BITS) {

    if (size > BDRV_REQUEST_MAX_BYTES) {

        return -EIO;

    }
@@ -1017,7 +1017,7 @@ static int coroutine_fn bdrv_driver_preadv(BlockDriverState *bs, 


    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);

    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);

    assert((bytes >> BDRV_SECTOR_BITS) <= BDRV_REQUEST_MAX_SECTORS);

    assert(bytes <= BDRV_REQUEST_MAX_BYTES);

    assert(drv->bdrv_co_readv);



    return drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov);
@@ -1070,7 +1070,7 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriverState *bs, 


    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);

    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);

    assert((bytes >> BDRV_SECTOR_BITS) <= BDRV_REQUEST_MAX_SECTORS);

    assert(bytes <= BDRV_REQUEST_MAX_BYTES);



    assert(drv->bdrv_co_writev);

    ret = drv->bdrv_co_writev(bs, sector_num, nb_sectors, qiov,

qemu-io-cmds.c

+3 −4
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static int do_write_compressed(BlockBackend *blk, char *buf, int64_t offset, 
{

    int ret;



    if (bytes >> 9 > BDRV_REQUEST_MAX_SECTORS) {

    if (bytes > BDRV_REQUEST_MAX_BYTES) {

        return -ERANGE;

    }
@@ -1781,10 +1781,9 @@ static int discard_f(BlockBackend *blk, int argc, char **argv) 
    if (bytes < 0) {

        print_cvtnum_err(bytes, argv[optind]);

        return bytes;

    } else if (bytes >> BDRV_SECTOR_BITS > BDRV_REQUEST_MAX_SECTORS) {

    } else if (bytes > BDRV_REQUEST_MAX_BYTES) {

        printf("length cannot exceed %"PRIu64", given %s\n",

               (uint64_t)BDRV_REQUEST_MAX_SECTORS << BDRV_SECTOR_BITS,

               argv[optind]);

               (uint64_t)BDRV_REQUEST_MAX_BYTES, argv[optind]);

        return -EINVAL;

    }