Skip to content

Commit

Permalink
block: Change blk_pwrite_compressed() param order
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
albertofaria authored and XanClic committed Jul 12, 2022
1 parent 09cca04 commit 0cadf2c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions block/block-backend.c
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions include/sysemu/block-backend-io.h
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion qemu-img.c
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion qemu-io-cmds.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 0cadf2c

Please sign in to comment.