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

block: Merge .bdrv_co_writev{,_flags} in drivers 



We have too many driver callback interfaces; simplify the mess
somewhat by merging the flags parameter of .bdrv_co_writev_flags()
into .bdrv_co_writev().  Note that as long as a driver doesn't set
.supported_write_flags, the flags argument will be 0 and behavior is
identical.  Also note that the public function bdrv_co_writev() still
lacks a flags argument; so the driver signature is thus intentionally
slightly different.  But that's not the end of the world, nor the first
time that the driver interface differs slightly from the public
interface.

Ideally, we should be rewriting all of these drivers to use modern
byte-based interfaces.  But that's a more invasive patch to write
and audit, compared to the simplification done here.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent edfab6a0

block/gluster.c

+3 −1
Original line number Diff line number Diff line
@@ -1194,8 +1194,10 @@ static coroutine_fn int qemu_gluster_co_readv(BlockDriverState *bs, 
static coroutine_fn int qemu_gluster_co_writev(BlockDriverState *bs,

                                               int64_t sector_num,

                                               int nb_sectors,

                                               QEMUIOVector *qiov)

                                               QEMUIOVector *qiov,

                                               int flags)

{

    assert(!flags);

    return qemu_gluster_co_rw(bs, sector_num, nb_sectors, qiov, 1);

}

block/io.c

+4 −9
Original line number Diff line number Diff line
@@ -1000,15 +1000,10 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriverState *bs, 
    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);

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



    if (drv->bdrv_co_writev_flags) {

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

    assert(drv->bdrv_co_writev);

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

                              flags & bs->supported_write_flags);

    flags &= ~bs->supported_write_flags;

    } else {

        assert(drv->bdrv_co_writev);

        assert(!bs->supported_write_flags);

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

    }



emulate_flags:

    if (ret == 0 && (flags & BDRV_REQ_FUA)) {

block/iscsi.c

+4 −4
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static inline bool iscsi_allocmap_is_valid(IscsiLun *iscsilun, 
}



static int coroutine_fn

iscsi_co_writev_flags(BlockDriverState *bs, int64_t sector_num, int nb_sectors,

iscsi_co_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors,

                QEMUIOVector *iov, int flags)

{

    IscsiLun *iscsilun = bs->opaque;
@@ -2220,7 +2220,7 @@ static BlockDriver bdrv_iscsi = { 
    .bdrv_co_pdiscard      = iscsi_co_pdiscard,

    .bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes,

    .bdrv_co_readv         = iscsi_co_readv,

    .bdrv_co_writev_flags  = iscsi_co_writev_flags,

    .bdrv_co_writev        = iscsi_co_writev,

    .bdrv_co_flush_to_disk = iscsi_co_flush,



#ifdef __linux__
@@ -2255,7 +2255,7 @@ static BlockDriver bdrv_iser = { 
    .bdrv_co_pdiscard      = iscsi_co_pdiscard,

    .bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes,

    .bdrv_co_readv         = iscsi_co_readv,

    .bdrv_co_writev_flags  = iscsi_co_writev_flags,

    .bdrv_co_writev        = iscsi_co_writev,

    .bdrv_co_flush_to_disk = iscsi_co_flush,



#ifdef __linux__

block/parallels.c

+3 −1
Original line number Diff line number Diff line
@@ -311,13 +311,15 @@ static int coroutine_fn parallels_co_block_status(BlockDriverState *bs, 
}



static coroutine_fn int parallels_co_writev(BlockDriverState *bs,

        int64_t sector_num, int nb_sectors, QEMUIOVector *qiov)

                                            int64_t sector_num, int nb_sectors,

                                            QEMUIOVector *qiov, int flags)

{

    BDRVParallelsState *s = bs->opaque;

    uint64_t bytes_done = 0;

    QEMUIOVector hd_qiov;

    int ret = 0;



    assert(!flags);

    qemu_iovec_init(&hd_qiov, qiov->niov);



    while (nb_sectors > 0) {

block/qcow.c

+4 −2
Original line number Diff line number Diff line
@@ -720,7 +720,8 @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num, 
}



static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,

                          int nb_sectors, QEMUIOVector *qiov)

                                       int nb_sectors, QEMUIOVector *qiov,

                                       int flags)

{

    BDRVQcowState *s = bs->opaque;

    int index_in_cluster;
@@ -731,6 +732,7 @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num, 
    uint8_t *buf;

    void *orig_buf;



    assert(!flags);

    s->cluster_cache_offset = -1; /* disable compressed cache */



    /* We must always copy the iov when encrypting, so we
@@ -1110,7 +1112,7 @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset, 
    if (ret != Z_STREAM_END || out_len >= s->cluster_size) {

        /* could not compress: write normal cluster */

        ret = qcow_co_writev(bs, offset >> BDRV_SECTOR_BITS,

                             bytes >> BDRV_SECTOR_BITS, qiov);

                             bytes >> BDRV_SECTOR_BITS, qiov, 0);

        if (ret < 0) {

            goto fail;

        }