[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/35] block: Implement blk_pdiscard() using generated_co_wrapper
From: |
Hanna Reitz |
Subject: |
[PULL 25/35] block: Implement blk_pdiscard() using generated_co_wrapper |
Date: |
Tue, 12 Jul 2022 20:06:07 +0200 |
From: Alberto Faria <afaria@redhat.com>
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-14-afaria@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/coroutines.h | 3 ---
include/sysemu/block-backend-io.h | 3 ++-
block/block-backend.c | 12 ------------
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/block/coroutines.h b/block/coroutines.h
index 94fd283f62..2693ecabfb 100644
--- a/block/coroutines.h
+++ b/block/coroutines.h
@@ -110,9 +110,6 @@ 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_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes);
-
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 346ca47fed..5a12a1f74f 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -159,6 +159,8 @@ static inline int coroutine_fn blk_co_pwrite(BlockBackend
*blk, int64_t offset,
return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
}
+int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset,
+ int64_t bytes);
int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset,
int64_t bytes);
@@ -172,7 +174,6 @@ int generated_co_wrapper blk_pwrite_compressed(BlockBackend
*blk,
const void *buf);
int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset,
int64_t bytes, const void *buf);
-int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes);
int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
int64_t bytes,
BdrvRequestFlags flags);
diff --git a/block/block-backend.c b/block/block-backend.c
index 85661d1823..71585c0c0a 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1711,18 +1711,6 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk,
int64_t offset,
return ret;
}
-int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes)
-{
- int ret;
- IO_OR_GS_CODE();
-
- blk_inc_in_flight(blk);
- ret = blk_do_pdiscard(blk, offset, bytes);
- blk_dec_in_flight(blk);
-
- return ret;
-}
-
/* To be called between exactly one pair of blk_inc/dec_in_flight() */
int coroutine_fn blk_co_do_flush(BlockBackend *blk)
{
--
2.35.3
- [PULL 07/35] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper, (continued)
- [PULL 07/35] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper, Hanna Reitz, 2022/07/12
- [PULL 05/35] block: Make bdrv_co_pwrite() take a const buffer, Hanna Reitz, 2022/07/12
- [PULL 09/35] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn, Hanna Reitz, 2022/07/12
- [PULL 08/35] block: Add bdrv_co_pwrite_sync(), Hanna Reitz, 2022/07/12
- [PULL 10/35] block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty(), Hanna Reitz, 2022/07/12
- [PULL 12/35] tests/qemu-iotests: skip 108 when FUSE is not loaded, Hanna Reitz, 2022/07/12
- [PULL 16/35] block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t, Hanna Reitz, 2022/07/12
- [PULL 13/35] block: Make blk_{pread,pwrite}() return 0 on success, Hanna Reitz, 2022/07/12
- [PULL 11/35] tests/qemu-iotests: hotfix for 307, 223 output, Hanna Reitz, 2022/07/12
- [PULL 24/35] block: Implement blk_pwrite_zeroes() using generated_co_wrapper, Hanna Reitz, 2022/07/12
- [PULL 25/35] block: Implement blk_pdiscard() using generated_co_wrapper,
Hanna Reitz <=
- [PULL 15/35] block: Change blk_{pread,pwrite}() param order, Hanna Reitz, 2022/07/12
- [PULL 14/35] block: Add a 'flags' param to blk_pread(), Hanna Reitz, 2022/07/12
- [PULL 17/35] block: Make blk_co_pwrite() take a const buffer, Hanna Reitz, 2022/07/12
- [PULL 28/35] block: Add blk_co_truncate(), Hanna Reitz, 2022/07/12
- [PULL 19/35] block: Add blk_{preadv,pwritev}(), Hanna Reitz, 2022/07/12
- [PULL 31/35] qsd: Do not use error_report() before monitor_init, Hanna Reitz, 2022/07/12
- [PULL 20/35] block: Add blk_[co_]preadv_part(), Hanna Reitz, 2022/07/12
- [PULL 22/35] block: Change blk_pwrite_compressed() param order, Hanna Reitz, 2022/07/12
- [PULL 21/35] block: Export blk_pwritev_part() in block-backend-io.h, Hanna Reitz, 2022/07/12
- [PULL 18/35] block: Implement blk_{pread, pwrite}() using generated_co_wrapper, Hanna Reitz, 2022/07/12