[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/35] block: Change blk_pwrite_compressed() param order
From: |
Hanna Reitz |
Subject: |
[PULL 22/35] block: Change blk_pwrite_compressed() param order |
Date: |
Tue, 12 Jul 2022 20:06:04 +0200 |
From: Alberto Faria <afaria@redhat.com>
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>
Message-Id: <20220705161527.1054072-11-afaria@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
include/sysemu/block-backend-io.h | 4 ++--
block/block-backend.c | 4 ++--
qemu-img.c | 2 +-
qemu-io-cmds.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/sysemu/block-backend-io.h
b/include/sysemu/block-backend-io.h
index 93a15071c4..695b793a72 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -167,8 +167,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/block/block-backend.c b/block/block-backend.c
index c75942b773..60fb7eb3f2 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -2314,8 +2314,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/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.35.3
- [PULL 11/35] tests/qemu-iotests: hotfix for 307, 223 output, (continued)
- [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, 2022/07/12
- [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 <=
- [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
- [PULL 26/35] block: Implement blk_flush() using generated_co_wrapper, Hanna Reitz, 2022/07/12
- [PULL 27/35] block: Add blk_co_ioctl(), Hanna Reitz, 2022/07/12
- [PULL 30/35] block: Remove remaining unused symbols in coroutines.h, Hanna Reitz, 2022/07/12
- [PULL 23/35] block: Add blk_co_pwrite_compressed(), Hanna Reitz, 2022/07/12
- [PULL 29/35] block: Reorganize some declarations in block-backend-io.h, Hanna Reitz, 2022/07/12
- [PULL 32/35] iotests/297: Have mypy ignore unused ignores, Hanna Reitz, 2022/07/12
- [PULL 33/35] qsd: Unlink absolute PID file path, Hanna Reitz, 2022/07/12
- [PULL 34/35] vl: Conditionally register PID file unlink notifier, Hanna Reitz, 2022/07/12