From 0e5a55b3556fdd23bbeeaca40a151e7062d42c1e Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 14 Aug 2019 08:42:25 +0100 Subject: [PATCH 02/10] block-backend: Make blk_inc/dec_in_flight public RH-Author: Kevin Wolf Message-id: <20190814084229.6458-2-kwolf@redhat.com> Patchwork-id: 89966 O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 1/5] block-backend: Make blk_inc/dec_in_flight public Bugzilla: 1716349 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Max Reitz RH-Acked-by: Paolo Bonzini For some users of BlockBackends, just increasing the in_flight counter is easier than implementing separate handlers in BlockDevOps. Make the helper functions for this public. Signed-off-by: Kevin Wolf (cherry picked from commit c90e2a9cfd94bd02d92c53b97f04fd595001de7e) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- block/block-backend.c | 4 ++-- include/sysemu/block-backend.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 0d623e4..e941520 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1294,12 +1294,12 @@ int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags) return bdrv_make_zero(blk->root, flags); } -static void blk_inc_in_flight(BlockBackend *blk) +void blk_inc_in_flight(BlockBackend *blk) { atomic_inc(&blk->in_flight); } -static void blk_dec_in_flight(BlockBackend *blk) +void blk_dec_in_flight(BlockBackend *blk) { atomic_dec(&blk->in_flight); aio_wait_kick(); diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 20f8bbb..815b6e5 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -157,6 +157,8 @@ int blk_co_pdiscard(BlockBackend *blk, int64_t offset, int bytes); int blk_co_flush(BlockBackend *blk); int blk_flush(BlockBackend *blk); int blk_commit_all(void); +void blk_inc_in_flight(BlockBackend *blk); +void blk_dec_in_flight(BlockBackend *blk); void blk_drain(BlockBackend *blk); void blk_drain_all(void); void blk_set_on_error(BlockBackend *blk, BlockdevOnError on_read_error, -- 1.8.3.1