diff options
| author | Alberto Faria <afaria@redhat.com> | 2022-07-05 17:15:22 +0100 |
|---|---|---|
| committer | Hanna Reitz <hreitz@redhat.com> | 2022-07-12 12:14:56 +0200 |
| commit | 25873f57c6c927999b5a613204acaa2e221d8e14 (patch) | |
| tree | 8a48b72b1e0545e28cfb56886446b39a4523b9b8 | |
| parent | 50db162df068e1951aebf5c28d254ded883e9468 (diff) | |
| download | qemu-25873f57c6c927999b5a613204acaa2e221d8e14.zip qemu-25873f57c6c927999b5a613204acaa2e221d8e14.tar.gz qemu-25873f57c6c927999b5a613204acaa2e221d8e14.tar.bz2 | |
block: Implement blk_flush() using generated_co_wrapper
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220705161527.1054072-15-afaria@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
| -rw-r--r-- | block/block-backend.c | 11 | ||||
| -rw-r--r-- | block/coroutines.h | 2 | ||||
| -rw-r--r-- | include/sysemu/block-backend-io.h | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 71585c0..783a77c 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1752,17 +1752,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 2693eca..7e94b9f 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 5a12a1f..6954c3b 100644 --- a/include/sysemu/block-backend-io.h +++ b/include/sysemu/block-backend-io.h @@ -164,8 +164,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); |