block: Reorganize some declarations in block-backend-io.h
Keep generated_co_wrapper and coroutine_fn pairs together. This should make it clear that each I/O function has these two versions. Also move blk_co_{pread,pwrite}()'s implementations out of the header file for consistency. Signed-off-by: Alberto Faria <afaria@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20220705161527.1054072-18-afaria@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
parent
015ed2529a
commit
6f675c9306
|
@ -1314,6 +1314,17 @@ blk_co_do_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, int64_t bytes,
|
||||||
|
void *buf, BdrvRequestFlags flags)
|
||||||
|
{
|
||||||
|
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||||
|
IO_OR_GS_CODE();
|
||||||
|
|
||||||
|
assert(bytes <= SIZE_MAX);
|
||||||
|
|
||||||
|
return blk_co_preadv(blk, offset, bytes, &qiov, flags);
|
||||||
|
}
|
||||||
|
|
||||||
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
|
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
BdrvRequestFlags flags)
|
BdrvRequestFlags flags)
|
||||||
|
@ -1395,6 +1406,17 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes,
|
||||||
|
const void *buf, BdrvRequestFlags flags)
|
||||||
|
{
|
||||||
|
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||||
|
IO_OR_GS_CODE();
|
||||||
|
|
||||||
|
assert(bytes <= SIZE_MAX);
|
||||||
|
|
||||||
|
return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
|
||||||
|
}
|
||||||
|
|
||||||
int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
|
int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
BdrvRequestFlags flags)
|
BdrvRequestFlags flags)
|
||||||
|
|
|
@ -104,9 +104,16 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
|
||||||
int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset,
|
int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes, void *buf,
|
int64_t bytes, void *buf,
|
||||||
BdrvRequestFlags flags);
|
BdrvRequestFlags flags);
|
||||||
int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,
|
int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, int64_t bytes,
|
||||||
int64_t bytes, const void *buf,
|
void *buf, BdrvRequestFlags flags);
|
||||||
|
|
||||||
|
int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset,
|
||||||
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
BdrvRequestFlags flags);
|
BdrvRequestFlags flags);
|
||||||
|
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
|
||||||
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
|
BdrvRequestFlags flags);
|
||||||
|
|
||||||
int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset,
|
int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
size_t qiov_offset,
|
size_t qiov_offset,
|
||||||
|
@ -114,12 +121,20 @@ int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset,
|
||||||
int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset,
|
int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
size_t qiov_offset, BdrvRequestFlags flags);
|
size_t qiov_offset, BdrvRequestFlags flags);
|
||||||
int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset,
|
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,
|
||||||
|
int64_t bytes, const void *buf,
|
||||||
BdrvRequestFlags flags);
|
BdrvRequestFlags flags);
|
||||||
int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
|
int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes,
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
const void *buf, BdrvRequestFlags flags);
|
||||||
BdrvRequestFlags flags);
|
|
||||||
|
int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset,
|
||||||
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
|
BdrvRequestFlags flags);
|
||||||
|
int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
|
||||||
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
|
BdrvRequestFlags flags);
|
||||||
|
|
||||||
int generated_co_wrapper blk_pwritev_part(BlockBackend *blk, int64_t offset,
|
int generated_co_wrapper blk_pwritev_part(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
int64_t bytes, QEMUIOVector *qiov,
|
||||||
size_t qiov_offset,
|
size_t qiov_offset,
|
||||||
|
@ -128,36 +143,18 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes,
|
int64_t bytes,
|
||||||
QEMUIOVector *qiov, size_t qiov_offset,
|
QEMUIOVector *qiov, size_t qiov_offset,
|
||||||
BdrvRequestFlags flags);
|
BdrvRequestFlags flags);
|
||||||
int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset,
|
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
|
||||||
BdrvRequestFlags flags);
|
|
||||||
int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
|
|
||||||
int64_t bytes, QEMUIOVector *qiov,
|
|
||||||
BdrvRequestFlags flags);
|
|
||||||
|
|
||||||
static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset,
|
int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk,
|
||||||
int64_t bytes, void *buf,
|
int64_t offset, int64_t bytes,
|
||||||
BdrvRequestFlags flags)
|
const void *buf);
|
||||||
{
|
int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset,
|
||||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
int64_t bytes, const void *buf);
|
||||||
IO_OR_GS_CODE();
|
|
||||||
|
|
||||||
assert(bytes <= SIZE_MAX);
|
int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
||||||
|
int64_t bytes,
|
||||||
return blk_co_preadv(blk, offset, bytes, &qiov, flags);
|
BdrvRequestFlags flags);
|
||||||
}
|
int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
||||||
|
int64_t bytes, BdrvRequestFlags flags);
|
||||||
static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset,
|
|
||||||
int64_t bytes, const void *buf,
|
|
||||||
BdrvRequestFlags flags)
|
|
||||||
{
|
|
||||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
|
||||||
IO_OR_GS_CODE();
|
|
||||||
|
|
||||||
assert(bytes <= SIZE_MAX);
|
|
||||||
|
|
||||||
return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset,
|
int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes);
|
int64_t bytes);
|
||||||
|
@ -172,16 +169,6 @@ int generated_co_wrapper blk_ioctl(BlockBackend *blk, unsigned long int req,
|
||||||
int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req,
|
int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req,
|
||||||
void *buf);
|
void *buf);
|
||||||
|
|
||||||
int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk,
|
|
||||||
int64_t offset, int64_t bytes,
|
|
||||||
const void *buf);
|
|
||||||
int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset,
|
|
||||||
int64_t bytes, const void *buf);
|
|
||||||
int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
|
||||||
int64_t bytes,
|
|
||||||
BdrvRequestFlags flags);
|
|
||||||
int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
|
||||||
int64_t bytes, BdrvRequestFlags flags);
|
|
||||||
int generated_co_wrapper blk_truncate(BlockBackend *blk, int64_t offset,
|
int generated_co_wrapper blk_truncate(BlockBackend *blk, int64_t offset,
|
||||||
bool exact, PreallocMode prealloc,
|
bool exact, PreallocMode prealloc,
|
||||||
BdrvRequestFlags flags, Error **errp);
|
BdrvRequestFlags flags, Error **errp);
|
||||||
|
|
Loading…
Reference in New Issue