| Message ID | 20220517113907.200001-3-afaria@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Make block-backend-io.h API more consistent | expand |
On 5/17/22 13:39, Alberto Faria wrote: > Signed-off-by: Alberto Faria <afaria@redhat.com> > --- > block/block-backend.c | 11 ----------- > block/coroutines.h | 2 -- > include/sysemu/block-backend-io.h | 2 +- > 3 files changed, 1 insertion(+), 14 deletions(-) Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
On 17.05.22 13:39, Alberto Faria wrote: > Signed-off-by: Alberto Faria <afaria@redhat.com> > --- > block/block-backend.c | 11 ----------- > block/coroutines.h | 2 -- > include/sysemu/block-backend-io.h | 2 +- > 3 files changed, 1 insertion(+), 14 deletions(-) Reviewed-by: Hanna Reitz <hreitz@redhat.com>
diff --git a/block/block-backend.c b/block/block-backend.c index 823c98a031..0718441b37 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1756,17 +1756,6 @@ int coroutine_fn blk_co_flush(BlockBackend *blk) return ret; } -int blk_flush(BlockBackend *blk) -{ - int ret; - - blk_inc_in_flight(blk); - ret = blk_do_flush(blk); - blk_dec_in_flight(blk); - - return ret; -} - void blk_drain(BlockBackend *blk) { BlockDriverState *bs = blk_bs(blk); diff --git a/block/coroutines.h b/block/coroutines.h index 2693ecabfb..7e94b9fa83 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -110,6 +110,4 @@ nbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp); int generated_co_wrapper blk_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); -int generated_co_wrapper blk_do_flush(BlockBackend *blk); - #endif /* BLOCK_COROUTINES_H */ diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h index 5c56737453..e6af0d0ed0 100644 --- a/include/sysemu/block-backend-io.h +++ b/include/sysemu/block-backend-io.h @@ -165,8 +165,8 @@ int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset, int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); +int generated_co_wrapper blk_flush(BlockBackend *blk); int coroutine_fn blk_co_flush(BlockBackend *blk); -int blk_flush(BlockBackend *blk); int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf);
Signed-off-by: Alberto Faria <afaria@redhat.com> --- block/block-backend.c | 11 ----------- block/coroutines.h | 2 -- include/sysemu/block-backend-io.h | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-)