block: Change blk_pwrite_compressed() param order
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>
This commit is contained in:
parent
09cca043bf
commit
0cadf2c8a3
@ -2314,8 +2314,8 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
|||||||
flags | BDRV_REQ_ZERO_WRITE);
|
flags | BDRV_REQ_ZERO_WRITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
|
int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, int64_t bytes,
|
||||||
int64_t bytes)
|
const void *buf)
|
||||||
{
|
{
|
||||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||||
IO_OR_GS_CODE();
|
IO_OR_GS_CODE();
|
||||||
|
@ -167,8 +167,8 @@ int blk_flush(BlockBackend *blk);
|
|||||||
|
|
||||||
int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf);
|
int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf);
|
||||||
|
|
||||||
int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
|
int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, int64_t bytes,
|
||||||
int64_t bytes);
|
const void *buf);
|
||||||
int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes);
|
int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes);
|
||||||
int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
||||||
int64_t bytes, BdrvRequestFlags flags);
|
int64_t bytes, BdrvRequestFlags flags);
|
||||||
|
@ -2114,7 +2114,7 @@ static int convert_do_copy(ImgConvertState *s)
|
|||||||
|
|
||||||
if (s->compressed && !s->ret) {
|
if (s->compressed && !s->ret) {
|
||||||
/* signal EOF to align */
|
/* 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) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -631,7 +631,7 @@ static int do_write_compressed(BlockBackend *blk, char *buf, int64_t offset,
|
|||||||
return -ERANGE;
|
return -ERANGE;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = blk_pwrite_compressed(blk, offset, buf, bytes);
|
ret = blk_pwrite_compressed(blk, offset, bytes, buf);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user