[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/35] block: Use bdrv_co_pwrite_sync() when caller is coroutine_f
From: |
Hanna Reitz |
Subject: |
[PULL 09/35] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn |
Date: |
Tue, 12 Jul 2022 20:05:51 +0200 |
From: Alberto Faria <afaria@redhat.com>
Convert uses of bdrv_pwrite_sync() into bdrv_co_pwrite_sync() when the
callers are already coroutine_fn.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220609152744.3891847-10-afaria@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/parallels.c | 2 +-
block/qcow2-snapshot.c | 6 +++---
block/qcow2.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index f22444efff..8b23b9580d 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -481,7 +481,7 @@ static int coroutine_fn parallels_co_check(BlockDriverState
*bs,
ret = 0;
if (flush_bat) {
- ret = bdrv_pwrite_sync(bs->file, 0, s->header_size, s->header, 0);
+ ret = bdrv_co_pwrite_sync(bs->file, 0, s->header_size, s->header, 0);
if (ret < 0) {
res->check_errors++;
goto out;
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 60e0461632..d1d46facbf 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -512,9 +512,9 @@ int coroutine_fn
qcow2_check_read_snapshot_table(BlockDriverState *bs,
assert(fix & BDRV_FIX_ERRORS);
snapshot_table_pointer.nb_snapshots = cpu_to_be32(s->nb_snapshots);
- ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snapshots),
- sizeof(snapshot_table_pointer.nb_snapshots),
- &snapshot_table_pointer.nb_snapshots, 0);
+ ret = bdrv_co_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snapshots),
+ sizeof(snapshot_table_pointer.nb_snapshots),
+ &snapshot_table_pointer.nb_snapshots, 0);
if (ret < 0) {
result->check_errors++;
fprintf(stderr, "ERROR failed to update the snapshot count in the "
diff --git a/block/qcow2.c b/block/qcow2.c
index c43238a006..f2fb54c51f 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -4551,8 +4551,8 @@ static int coroutine_fn
qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
/* write updated header.size */
offset = cpu_to_be64(offset);
- ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),
- sizeof(offset), &offset, 0);
+ ret = bdrv_co_pwrite_sync(bs->file, offsetof(QCowHeader, size),
+ sizeof(offset), &offset, 0);
if (ret < 0) {
error_setg_errno(errp, -ret, "Failed to update the image size");
goto fail;
--
2.35.3
- [PULL 02/35] block: Change bdrv_{pread, pwrite, pwrite_sync}() param order, (continued)
- [PULL 02/35] block: Change bdrv_{pread, pwrite, pwrite_sync}() param order, Hanna Reitz, 2022/07/12
- [PULL 06/35] block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv, pwritev}() an int64_t, Hanna Reitz, 2022/07/12
- [PULL 08/35] block: Add bdrv_co_pwrite_sync(), Hanna Reitz, 2022/07/12
- [PULL 03/35] block: Make bdrv_{pread,pwrite}() return 0 on success, Hanna Reitz, 2022/07/12
- [PULL 04/35] crypto: Make block callbacks return 0 on success, Hanna Reitz, 2022/07/12
- [PULL 10/35] block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty(), Hanna Reitz, 2022/07/12
- [PULL 05/35] block: Make bdrv_co_pwrite() take a const buffer, Hanna Reitz, 2022/07/12
- [PULL 12/35] tests/qemu-iotests: skip 108 when FUSE is not loaded, Hanna Reitz, 2022/07/12
- [PULL 07/35] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper, Hanna Reitz, 2022/07/12
- [PULL 13/35] block: Make blk_{pread,pwrite}() return 0 on success, Hanna Reitz, 2022/07/12
- [PULL 09/35] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn,
Hanna Reitz <=
- [PULL 18/35] block: Implement blk_{pread, pwrite}() using generated_co_wrapper, Hanna Reitz, 2022/07/12
- [PULL 24/35] block: Implement blk_pwrite_zeroes() using generated_co_wrapper, Hanna Reitz, 2022/07/12
- [PULL 11/35] tests/qemu-iotests: hotfix for 307, 223 output, Hanna Reitz, 2022/07/12
- [PULL 14/35] block: Add a 'flags' param to blk_pread(), Hanna Reitz, 2022/07/12
- [PULL 16/35] block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t, Hanna Reitz, 2022/07/12
- [PULL 22/35] block: Change blk_pwrite_compressed() param order, Hanna Reitz, 2022/07/12
- [PULL 26/35] block: Implement blk_flush() 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 19/35] block: Add blk_{preadv,pwritev}(), Hanna Reitz, 2022/07/12
- [PULL 28/35] block: Add blk_co_truncate(), Hanna Reitz, 2022/07/12