All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 02/26] qcow2: remove incorrect coroutine_fn annotations
Date: Mon,  9 May 2022 12:29:55 +0200	[thread overview]
Message-ID: <20220509103019.215041-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20220509103019.215041-1-pbonzini@redhat.com>

This is incorrect because qcow2_mark_clean() calls qcow2_flush_caches().
qcow2_mark_clean() is called from non-coroutine context in
qcow2_inactivate() and qcow2_close().

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/qcow2-refcount.c | 4 ++--
 block/qcow2.h          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index ed0ecfaa89..404d56e258 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1206,7 +1206,7 @@ void qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry,
     }
 }
 
-int coroutine_fn qcow2_write_caches(BlockDriverState *bs)
+int qcow2_write_caches(BlockDriverState *bs)
 {
     BDRVQcow2State *s = bs->opaque;
     int ret;
@@ -1226,7 +1226,7 @@ int coroutine_fn qcow2_write_caches(BlockDriverState *bs)
     return 0;
 }
 
-int coroutine_fn qcow2_flush_caches(BlockDriverState *bs)
+int qcow2_flush_caches(BlockDriverState *bs)
 {
     int ret = qcow2_write_caches(bs);
     if (ret < 0) {
diff --git a/block/qcow2.h b/block/qcow2.h
index ba436a8d0d..c8d9e8ea79 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -874,8 +874,8 @@ void qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry,
 int qcow2_update_snapshot_refcount(BlockDriverState *bs,
     int64_t l1_table_offset, int l1_size, int addend);
 
-int coroutine_fn qcow2_flush_caches(BlockDriverState *bs);
-int coroutine_fn qcow2_write_caches(BlockDriverState *bs);
+int qcow2_flush_caches(BlockDriverState *bs);
+int qcow2_write_caches(BlockDriverState *bs);
 int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
                           BdrvCheckMode fix);
 
-- 
2.35.1



  parent reply	other threads:[~2022-05-09 10:34 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-09 10:29 [PATCH v2 00/26] block: fix coroutine_fn annotations Paolo Bonzini
2022-05-09 10:29 ` [PATCH v2 01/26] block: remove incorrect " Paolo Bonzini
2022-05-10 15:03   ` Eric Blake
2022-07-04 12:54   ` Alberto Faria
2022-05-09 10:29 ` Paolo Bonzini [this message]
2022-05-10 15:04   ` [PATCH v2 02/26] qcow2: " Eric Blake
2022-07-04 12:56   ` Alberto Faria
2022-05-09 10:29 ` [PATCH v2 03/26] nbd: " Paolo Bonzini
2022-05-10 15:05   ` Eric Blake
2022-07-04 12:56   ` Alberto Faria
2022-05-09 10:29 ` [PATCH v2 04/26] coroutine: " Paolo Bonzini
2022-05-10 15:12   ` Eric Blake
2022-07-04 12:57   ` Alberto Faria
2022-05-09 10:29 ` [PATCH v2 05/26] blkdebug: add missing " Paolo Bonzini
2022-05-10 15:30   ` Eric Blake
2022-05-09 10:29 ` [PATCH v2 06/26] blkverify: " Paolo Bonzini
2022-05-10 15:59   ` Eric Blake
2022-07-04 12:57   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 07/26] block: " Paolo Bonzini
2022-05-13 21:26   ` Eric Blake
2022-05-14  9:54     ` Paolo Bonzini
2022-05-16 18:49       ` Alberto Faria
2022-05-17  9:51         ` Paolo Bonzini
2022-05-09 10:30 ` [PATCH v2 08/26] file-posix: " Paolo Bonzini
2022-05-13 21:52   ` Eric Blake
2022-07-04 12:57   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 09/26] iscsi: " Paolo Bonzini
2022-05-18 14:44   ` Eric Blake
2022-07-04 12:58   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 10/26] nbd: " Paolo Bonzini
2022-05-18 14:50   ` Eric Blake
2022-07-04 12:58   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 11/26] nfs: " Paolo Bonzini
2022-07-04 12:59   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 12/26] nvme: " Paolo Bonzini
2022-07-04 12:59   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 13/26] parallels: " Paolo Bonzini
2022-07-04 12:59   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 14/26] qcow2: " Paolo Bonzini
2022-07-04 12:59   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 15/26] copy-before-write: " Paolo Bonzini
2022-07-04 12:59   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 16/26] curl: " Paolo Bonzini
2022-07-04 13:00   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 17/26] qed: " Paolo Bonzini
2022-07-04 13:01   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 18/26] quorum: " Paolo Bonzini
2022-07-04 13:01   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 19/26] throttle: " Paolo Bonzini
2022-07-04 13:02   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 20/26] vmdk: " Paolo Bonzini
2022-07-04 13:02   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 21/26] job: " Paolo Bonzini
2022-07-04 13:02   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 22/26] coroutine-lock: " Paolo Bonzini
2022-07-04 13:03   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 23/26] raw-format: " Paolo Bonzini
2022-07-04 13:03   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 24/26] 9p: " Paolo Bonzini
2022-07-04 13:03   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 25/26] migration: " Paolo Bonzini
2022-07-04 13:03   ` Alberto Faria
2022-05-09 10:30 ` [PATCH v2 26/26] test-coroutine: " Paolo Bonzini
2022-07-04 13:03   ` Alberto Faria
2022-05-09 11:53 ` [PATCH v2 00/26] block: fix " Daniel P. Berrangé
2022-05-09 13:30   ` Paolo Bonzini

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=20220509103019.215041-3-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.