[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/18] block: Change blk_pwrite_compressed() param order
From: |
Alberto Faria |
Subject: |
[PATCH v2 10/18] block: Change blk_pwrite_compressed() param order |
Date: |
Tue, 5 Jul 2022 17:15:18 +0100 |
Swap 'buf' and 'bytes' around for consistency with other I/O functions.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
block/block-backend.c | 4 ++--
include/sysemu/block-backend-io.h | 4 ++--
qemu-img.c | 2 +-
qemu-io-cmds.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 35bf35aadd..ddb1d4e179 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -2324,8 +2324,8 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk,
int64_t offset,
flags | BDRV_REQ_ZERO_WRITE);
}
-int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
- int64_t bytes)
+int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, int64_t bytes,
+ const void *buf)
{
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
IO_OR_GS_CODE();
diff --git a/include/sysemu/block-backend-io.h
b/include/sysemu/block-backend-io.h
index 31ebd8b6cf..c64207cdcb 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -168,8 +168,8 @@ int blk_flush(BlockBackend *blk);
int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf);
-int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
- int64_t bytes);
+int blk_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 blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
int64_t bytes, BdrvRequestFlags flags);
diff --git a/qemu-img.c b/qemu-img.c
index df607a2a2e..7d4b33b3da 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2114,7 +2114,7 @@ static int convert_do_copy(ImgConvertState *s)
if (s->compressed && !s->ret) {
/* signal EOF to align */
- ret = blk_pwrite_compressed(s->target, 0, NULL, 0);
+ ret = blk_pwrite_compressed(s->target, 0, 0, NULL);
if (ret < 0) {
return ret;
}
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index c8cbaed0cd..952dc940f1 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -631,7 +631,7 @@ static int do_write_compressed(BlockBackend *blk, char
*buf, int64_t offset,
return -ERANGE;
}
- ret = blk_pwrite_compressed(blk, offset, buf, bytes);
+ ret = blk_pwrite_compressed(blk, offset, bytes, buf);
if (ret < 0) {
return ret;
}
--
2.36.1
- [PATCH v2 01/18] block: Make blk_{pread, pwrite}() return 0 on success, (continued)
- [PATCH v2 01/18] block: Make blk_{pread, pwrite}() return 0 on success, Alberto Faria, 2022/07/05
- [PATCH v2 02/18] block: Add a 'flags' param to blk_pread(), Alberto Faria, 2022/07/05
- [PATCH v2 03/18] block: Change blk_{pread,pwrite}() param order, Alberto Faria, 2022/07/05
- [PATCH v2 04/18] block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t, Alberto Faria, 2022/07/05
- [PATCH v2 05/18] block: Make blk_co_pwrite() take a const buffer, Alberto Faria, 2022/07/05
- [PATCH v2 06/18] block: Implement blk_{pread, pwrite}() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 07/18] block: Add blk_{preadv,pwritev}(), Alberto Faria, 2022/07/05
- [PATCH v2 09/18] block: Export blk_pwritev_part() in block-backend-io.h, Alberto Faria, 2022/07/05
- [PATCH v2 08/18] block: Add blk_[co_]preadv_part(), Alberto Faria, 2022/07/05
- [PATCH v2 10/18] block: Change blk_pwrite_compressed() param order,
Alberto Faria <=
- [PATCH v2 11/18] block: Add blk_co_pwrite_compressed(), Alberto Faria, 2022/07/05
- [PATCH v2 12/18] block: Implement blk_pwrite_zeroes() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 13/18] block: Implement blk_pdiscard() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 14/18] block: Implement blk_flush() using generated_co_wrapper, Alberto Faria, 2022/07/05
- [PATCH v2 15/18] block: Add blk_co_ioctl(), Alberto Faria, 2022/07/05
- [PATCH v2 17/18] block: Reorganize some declarations in block-backend-io.h, Alberto Faria, 2022/07/05
- [PATCH v2 16/18] block: Add blk_co_truncate(), Alberto Faria, 2022/07/05
- [PATCH v2 18/18] block: Remove remaining unused symbols in coroutines.h, Alberto Faria, 2022/07/05
- Re: [PATCH v2 00/18] Make block-backend-io.h API more consistent, Hanna Reitz, 2022/07/06