Skip to content

block: fix coroutine_fn annotations

Paolo Bonzini qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest26 patches 39 repliesIn review
  2. v126 patches 18 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/26block: remove incorrect coroutine_fn annotationsblock/block-backend.c+4 -42 replies
2/26qcow2: remove incorrect coroutine_fn annotationsblock/qcow2-refcount.c block/qcow2.h+4 -42 replies
3/26nbd: remove incorrect coroutine_fn annotationsinclude/block/nbd.h+1 -12 replies
4/26coroutine: remove incorrect coroutine_fn annotationsinclude/qemu/coroutine.h util/qemu-coroutine.c+2 -22 replies
5/26blkdebug: add missing coroutine_fn annotationsblock/blkdebug.c+7 -71 reply
6/26blkverify: add missing coroutine_fn annotationsblock/blkverify.c+1 -12 replies
7/26block: add missing coroutine_fn annotationsblock/block-backend.c block/io.c+21 -214 replies
8/26file-posix: add missing coroutine_fn annotationsblock/file-posix.c+1 -12 replies
9/26iscsi: add missing coroutine_fn annotationsblock/iscsi.c+1 -12 replies
10/26nbd: add missing coroutine_fn annotationsblock/nbd.c+5 -52 replies
11/26nfs: add missing coroutine_fn annotationsblock/nfs.c+1 -11 reply
12/26nvme: add missing coroutine_fn annotationsblock/nvme.c+3 -21 reply
13/26parallels: add missing coroutine_fn annotationsblock/parallels.c+3 -21 reply
14/26qcow2: add missing coroutine_fn annotationsblock/qcow2-cluster.c block/qcow2-refcount.c block/qcow2.c +1 more+19 -191 reply
15/26copy-before-write: add missing coroutine_fn annotationsblock/copy-before-write.c+4 -41 reply
16/26curl: add missing coroutine_fn annotationsblock/curl.c+1 -11 reply
17/26qed: add missing coroutine_fn annotationsblock/qed.c+2 -21 reply
18/26quorum: add missing coroutine_fn annotationsblock/quorum.c+18 -171 reply
19/26throttle: add missing coroutine_fn annotationsblock/throttle.c+1 -11 reply
20/26vmdk: add missing coroutine_fn annotationsblock/vmdk.c+10 -101 reply
21/26job: add missing coroutine_fn annotationsinclude/qemu/job.h job.c+2 -21 reply
22/26coroutine-lock: add missing coroutine_fn annotationsutil/qemu-coroutine-lock.c+7 -71 reply
23/26raw-format: add missing coroutine_fn annotationsblock/raw-format.c+1 -11 reply
24/269p: add missing coroutine_fn annotationshw/9pfs/9p.h+6 -31 reply
25/26migration: add missing coroutine_fn annotationsmigration/migration.c+2 -11 reply
26/26test-coroutine: add missing coroutine_fn annotationstests/unit/test-coroutine.c+1 -11 reply

Reviews trailers per patch

25 of 26 patches have a Reviewed-by or Acked-by.

PatchGreg KurzJuan QuintelaStefan HajnocziEric BlakeAlberto Faria
1/26R-b R-b
2/26R-b R-b
3/26R-b R-b
4/26R-b R-b
5/26R-b
6/26R-b R-b
7/26
8/26R-b R-b
9/26R-b R-b
10/26R-b R-b
11/26R-b
12/26R-b
13/26R-b
14/26R-b
15/26R-b
16/26R-b
17/26R-b
18/26R-b
19/26R-b
20/26R-b
21/26R-b
22/26R-b
23/26R-b
24/26A-b R-b
25/26R-b R-b R-b
26/26R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/26] block: fix coroutine_fn annotations

This is the initial result of reviving Marc-André's series at
https://patchew.org/QEMU/[email protected]/.
A lot of the patches are similar to the ones that Marc-André wrote, but due to the changes in the code it was easier to redo them.

For nbd, the patch is on top of "nbd: mark more coroutine_fns" that I sent a few days ago and that (AIUI) Eric has already queued; only one function was missing, much to my surprise.

Apart from this, I also identified the following functions that can be called both in coroutine context and outside:

- qmp_dispatch
- schedule_next_request
- nvme_get_free_req
- bdrv_create
- bdrv_remove_persistent_dirty_bitmap
- bdrv_can_store_new_dirty_bitmap
- bdrv_do_drained_begin
- bdrv_do_drained_end
- bdrv_drain_all_begin
- qcow2_open
- qcow2_has_zero_init
- bdrv_qed_open
- qio_channel_readv_full_all_eof
- qio_channel_writev_full_all

besides, of course, everything that is generated by scripts/block-coroutine-wrapper.py.

The patches are exactly the same as v1, but I have improved the commit messages for the "remove incorrect coroutine_fn annotations" bits.

Marc-André Lureau (3):
9p: add missing coroutine_fn annotations
migration: add missing coroutine_fn annotations
test-coroutine: add missing coroutine_fn annotations

Paolo Bonzini (23):
block: remove incorrect coroutine_fn annotations
qcow2: remove incorrect coroutine_fn annotations
nbd: remove incorrect coroutine_fn annotations
coroutine: remove incorrect coroutine_fn annotations
blkdebug: add missing coroutine_fn annotations
blkverify: add missing coroutine_fn annotations
block: add missing coroutine_fn annotations
file-posix: add missing coroutine_fn annotations
iscsi: add missing coroutine_fn annotations
nbd: add missing coroutine_fn annotations
nfs: add missing coroutine_fn annotations
nvme: add missing coroutine_fn annotations
parallels: add missing coroutine_fn annotations
qcow2: add missing coroutine_fn annotations
copy-before-write: add missing coroutine_fn annotations
curl: add missing coroutine_fn annotations
qed: add missing coroutine_fn annotations
quorum: add missing coroutine_fn annotations
throttle: add missing coroutine_fn annotations
vmdk: add missing coroutine_fn annotations
job: add missing coroutine_fn annotations
coroutine-lock: add missing coroutine_fn annotations
raw-format: add missing coroutine_fn annotations

 block/blkdebug.c            | 14 +++++++-------
 block/blkverify.c           |  2 +-
 block/block-backend.c       | 26 +++++++++++++-------------
 block/copy-before-write.c   |  8 ++++----
 block/curl.c                |  2 +-
 block/file-posix.c          |  2 +-
 block/io.c                  | 24 ++++++++++++------------
 block/iscsi.c               |  2 +-
 block/nbd.c                 | 10 +++++-----
 block/nfs.c                 |  2 +-
 block/nvme.c                |  5 +++--
 block/parallels.c           |  5 +++--
 block/qcow2-cluster.c       | 18 +++++++++---------
 block/qcow2-refcount.c      |  6 +++---
 block/qcow2.c               |  4 ++--
 block/qcow2.h               | 18 +++++++++---------
 block/qed.c                 |  4 ++--
 block/quorum.c              | 35 ++++++++++++++++++-----------------
 block/raw-format.c          |  2 +-
 block/throttle.c            |  2 +-
 block/vmdk.c                | 20 ++++++++++----------
 hw/9pfs/9p.h                |  9 ++++++---
 include/block/nbd.h         |  2 +-
 include/qemu/coroutine.h    |  2 +-
 include/qemu/job.h          |  2 +-
 job.c                       |  2 +-
 migration/migration.c       |  3 ++-
 tests/unit/test-coroutine.c |  2 +-
 util/qemu-coroutine-lock.c  | 14 +++++++-------
 util/qemu-coroutine.c       |  2 +-
 30 files changed, 128 insertions(+), 121 deletions(-)
Signature · 1 line
2.35.1