Commit 2bb0dce7 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Lift more functions into BlockBackend 



There are already some blk_aio_* functions, so we might as well have
blk_co_* functions (as far as we need them). This patch adds
blk_co_flush(), blk_co_discard(), and also blk_invalidate_cache() (which
is not a blk_co_* function but is needed nonetheless).

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1416309679-333-2-git-send-email-mreitz@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 17fcb74a

block/block-backend.c

+15 −0
Original line number Diff line number Diff line
@@ -497,6 +497,16 @@ BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *buf, 
    return bdrv_aio_ioctl(blk->bs, req, buf, cb, opaque);

}



int blk_co_discard(BlockBackend *blk, int64_t sector_num, int nb_sectors)

{

    return bdrv_co_discard(blk->bs, sector_num, nb_sectors);

}



int blk_co_flush(BlockBackend *blk)

{

    return bdrv_co_flush(blk->bs);

}



int blk_flush(BlockBackend *blk)

{

    return bdrv_flush(blk->bs);
@@ -549,6 +559,11 @@ void blk_set_enable_write_cache(BlockBackend *blk, bool wce) 
    bdrv_set_enable_write_cache(blk->bs, wce);

}



void blk_invalidate_cache(BlockBackend *blk, Error **errp)

{

    bdrv_invalidate_cache(blk->bs, errp);

}



int blk_is_inserted(BlockBackend *blk)

{

    return bdrv_is_inserted(blk->bs);

include/sysemu/block-backend.h

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ int blk_aio_multiwrite(BlockBackend *blk, BlockRequest *reqs, int num_reqs); 
int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf);

BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *buf,

                          BlockCompletionFunc *cb, void *opaque);

int blk_co_discard(BlockBackend *blk, int64_t sector_num, int nb_sectors);

int blk_co_flush(BlockBackend *blk);

int blk_flush(BlockBackend *blk);

int blk_flush_all(void);

void blk_drain_all(void);
@@ -120,6 +122,7 @@ int blk_is_read_only(BlockBackend *blk); 
int blk_is_sg(BlockBackend *blk);

int blk_enable_write_cache(BlockBackend *blk);

void blk_set_enable_write_cache(BlockBackend *blk, bool wce);

void blk_invalidate_cache(BlockBackend *blk, Error **errp);

int blk_is_inserted(BlockBackend *blk);

void blk_lock_medium(BlockBackend *blk, bool locked);

void blk_eject(BlockBackend *blk, bool eject_flag);