qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alberto Faria <afaria@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Denis V. Lunev" <den@openvz.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <v.sementsov-og@mail.ru>,
	qemu-block@nongnu.org, "Kevin Wolf" <kwolf@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"John Snow" <jsnow@redhat.com>, "Hanna Reitz" <hreitz@redhat.com>,
	"Eric Blake" <eblake@redhat.com>, "Stefan Weil" <sw@weilnetz.de>,
	"Jeff Cody" <codyprime@gmail.com>, "Fam Zheng" <fam@euphon.net>,
	"Ari Sundholm" <ari@tuxera.com>,
	"Alberto Faria" <afaria@redhat.com>
Subject: [PATCH v3 09/10] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn
Date: Thu, 19 May 2022 15:48:39 +0100	[thread overview]
Message-ID: <20220519144841.784780-10-afaria@redhat.com> (raw)
In-Reply-To: <20220519144841.784780-1-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>
---
 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



  parent reply	other threads:[~2022-05-19 15:09 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-19 14:48 [PATCH v3 00/10] Implement bdrv_{pread, pwrite, pwrite_sync, pwrite_zeroes}() using generated_co_wrapper Alberto Faria
2022-05-19 14:48 ` [PATCH v3 01/10] block: Add a 'flags' param to bdrv_{pread, pwrite, pwrite_sync}() Alberto Faria
2022-05-26  8:38   ` [PATCH v3 01/10] block: Add a 'flags' param to bdrv_{pread,pwrite,pwrite_sync}() Stefan Hajnoczi
2022-05-27 10:02   ` Vladimir Sementsov-Ogievskiy
2022-05-19 14:48 ` [PATCH v3 02/10] block: Change bdrv_{pread, pwrite, pwrite_sync}() param order Alberto Faria
2022-05-26  8:41   ` Stefan Hajnoczi
2022-05-27 14:44   ` Vladimir Sementsov-Ogievskiy
2022-05-19 14:48 ` [PATCH v3 03/10] block: Make bdrv_{pread, pwrite}() return 0 on success Alberto Faria
2022-05-26  8:49   ` [PATCH v3 03/10] block: Make bdrv_{pread,pwrite}() " Stefan Hajnoczi
2022-05-26  8:53     ` Daniel P. Berrangé
2022-05-26  8:50   ` Stefan Hajnoczi
2022-05-19 14:48 ` [PATCH v3 04/10] crypto: Make block callbacks " Alberto Faria
2022-05-26  8:49   ` Stefan Hajnoczi
2022-05-19 14:48 ` [PATCH v3 05/10] block: Make bdrv_co_pwrite() take a const buffer Alberto Faria
2022-05-26  8:51   ` Stefan Hajnoczi
2022-05-19 14:48 ` [PATCH v3 06/10] block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv, pwritev}() an int64_t Alberto Faria
2022-05-24 21:14   ` [PATCH v3 06/10] block: Make 'bytes' param of bdrv_co_{pread,pwrite,preadv,pwritev}() " Eric Blake
2022-05-26  9:00   ` Stefan Hajnoczi
2022-05-26 11:05     ` [PATCH v3 06/10] block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv, pwritev}() " Alberto Faria
2022-05-27 14:23       ` [PATCH v3 06/10] block: Make 'bytes' param of bdrv_co_{pread,pwrite,preadv,pwritev}() " Eric Blake
2022-05-19 14:48 ` [PATCH v3 07/10] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper Alberto Faria
2022-05-26  8:55   ` [PATCH v3 07/10] block: Implement bdrv_{pread,pwrite,pwrite_zeroes}() " Stefan Hajnoczi
2022-05-26 19:23     ` [PATCH v3 07/10] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() " Alberto Faria
2022-05-27 14:25       ` [PATCH v3 07/10] block: Implement bdrv_{pread,pwrite,pwrite_zeroes}() " Eric Blake
2022-05-30 12:49         ` Stefan Hajnoczi
2022-06-06 16:10           ` [PATCH v3 07/10] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() " Alberto Faria
2022-06-08 12:50             ` [PATCH v3 07/10] block: Implement bdrv_{pread,pwrite,pwrite_zeroes}() " Stefan Hajnoczi
2022-06-09 15:13               ` [PATCH v3 07/10] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() " Alberto Faria
2022-05-30 12:56         ` [PATCH v3 07/10] block: Implement bdrv_{pread,pwrite,pwrite_zeroes}() " Stefan Hajnoczi
2022-05-30 13:02         ` Stefan Hajnoczi
2022-05-19 14:48 ` [PATCH v3 08/10] block: Add bdrv_co_pwrite_sync() Alberto Faria
2022-05-26  8:57   ` Stefan Hajnoczi
2022-05-19 14:48 ` Alberto Faria [this message]
2022-05-26  9:01   ` [PATCH v3 09/10] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn Stefan Hajnoczi
2022-05-19 14:48 ` [PATCH v3 10/10] block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty() Alberto Faria
2022-05-26  9:01   ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220519144841.784780-10-afaria@redhat.com \
    --to=afaria@redhat.com \
    --cc=ari@tuxera.com \
    --cc=berrange@redhat.com \
    --cc=codyprime@gmail.com \
    --cc=den@openvz.org \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=hreitz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=sw@weilnetz.de \
    --cc=v.sementsov-og@mail.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).