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

block: Remove unused sector-based vectored I/O 



We are gradually moving away from sector-based interfaces, towards
byte-based.  Now that all callers of vectored I/O have been converted
to use our preferred byte-based bdrv_co_p{read,write}v(), we can
delete the unused bdrv_co_{read,write}v().

Furthermore, this gets rid of the signature difference between the
public bdrv_co_writev() and the callback .bdrv_co_writev (the
latter still exists, because some drivers still need more work
before they are fully byte-based).

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3a7404b3

block/io.c

+0 −36
Original line number Diff line number Diff line
@@ -1429,24 +1429,6 @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child, 
    return ret;

}



static int coroutine_fn bdrv_co_do_readv(BdrvChild *child,

    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,

    BdrvRequestFlags flags)

{

    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {

        return -EINVAL;

    }



    return bdrv_co_preadv(child, sector_num << BDRV_SECTOR_BITS,

                          nb_sectors << BDRV_SECTOR_BITS, qiov, flags);

}



int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,

                               int nb_sectors, QEMUIOVector *qiov)

{

    return bdrv_co_do_readv(child, sector_num, nb_sectors, qiov, 0);

}



static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,

    int64_t offset, int bytes, BdrvRequestFlags flags)

{
@@ -1889,24 +1871,6 @@ out: 
    return ret;

}



static int coroutine_fn bdrv_co_do_writev(BdrvChild *child,

    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,

    BdrvRequestFlags flags)

{

    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {

        return -EINVAL;

    }



    return bdrv_co_pwritev(child, sector_num << BDRV_SECTOR_BITS,

                           nb_sectors << BDRV_SECTOR_BITS, qiov, flags);

}



int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,

    int nb_sectors, QEMUIOVector *qiov)

{

    return bdrv_co_do_writev(child, sector_num, nb_sectors, qiov, 0);

}



int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset,

                                       int bytes, BdrvRequestFlags flags)

{

include/block/block.h

+0 −4
Original line number Diff line number Diff line
@@ -285,10 +285,6 @@ int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf, int bytes); 
int bdrv_pwritev(BdrvChild *child, int64_t offset, QEMUIOVector *qiov);

int bdrv_pwrite_sync(BdrvChild *child, int64_t offset,

                     const void *buf, int count);

int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,

                               int nb_sectors, QEMUIOVector *qiov);

int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,

                               int nb_sectors, QEMUIOVector *qiov);

/*

 * Efficiently zero a region of the disk image.  Note that this is a regular

 * I/O request like read or write and should have a reasonable size.  This