| Message ID | 20220517113837.199696-6-afaria@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Make block-backend-io.h API more consistent | expand |
On 5/17/22 13:38, Alberto Faria wrote: > 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> > --- > 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 8d214e649e..52f3aeed9b 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; > }
On 17.05.22 13:38, Alberto Faria wrote: > Swap 'buf' and 'bytes' around for consistency with other I/O functions. > > Signed-off-by: Alberto Faria <afaria@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(-) Reviewed-by: Hanna Reitz <hreitz@redhat.com>
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 8d214e649e..52f3aeed9b 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; }
Swap 'buf' and 'bytes' around for consistency with other I/O functions. Signed-off-by: Alberto Faria <afaria@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(-)