Skip to content

Still more coroutine and various fixes in block layer

Emanuele Giuseppe Esposito qemu-devel 7 versions – Applied

Status from this message: Thanks, applied to block-next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest14 patches 1 replyApplied
  2. v614 patches 16 repliesSuperseded
  3. v515 patches 12 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v411 patches19 repliesSuperseded
v38 patches1 replySuperseded
v29 patches18 repliesSuperseded
v19 patches13 repliesSuperseded

v6 from the cover letter

* use different naming for block-coroutine-wrapper annotations
* fix minor typos and patch odering

Patches in v7 Applied

#Subject and filesSizeRepliesApplied
1/14block-io: introduce coroutine_fn duplicates for bdrv_common_block_status_above callersblock/io.c include/block/block-io.h+70 -30 replies
2/14block-copy: add coroutine_fn annotationsblock/block-copy.c include/block/block-copy.h+15 -110 replies
3/14nbd/server.c: add coroutine_fn annotationsnbd/server.c+16 -130 replies
4/14block-backend: replace bdrv_*_above with blk_*_aboveblock/block-backend.c block/commit.c include/sysemu/block-backend-io.h +1 more+48 -180 replies
5/14block/vmdk: add coroutine_fn annotationsblock/vmdk.c+19 -170 replies
6/14block: avoid duplicating filename string in bdrv_createblock.c+2 -50 replies
7/14block: distinguish between bdrv_create running in coroutine and notblock.c+34 -350 replies
8/14block: bdrv_create_file is a coroutine_fnblock.c block/crypto.c block/parallels.c +9 more+16 -140 replies
9/14block: rename generated_co_wrapper in co_wrapper_mixedblock/coroutines.h docs/devel/block-coroutine-wrapper.rst include/block/block-common.h +3 more+71 -680 replies
10/14block-coroutine-wrapper.py: introduce co_wrapperdocs/devel/block-coroutine-wrapper.rst include/block/block-common.h scripts/block-coroutine-wrapper.py+86 -380 replies
11/14block-coroutine-wrapper.py: support functions without bs argblock/block-gen.h scripts/block-coroutine-wrapper.py+11 -110 replies
12/14block-coroutine-wrapper.py: support also basic return typesblock/block-gen.h scripts/block-coroutine-wrapper.py+12 -120 replies
13/14block: convert bdrv_create to co_wrapperblock.c include/block/block-global-state.h+8 -410 replies
14/14block/dirty-bitmap: convert coroutine-only functions to co_wrapperblock/dirty-bitmap.c block/meson.build include/block/block-common.h +2 more+22 -920 replies

Reviews trailers per patch

All 14 patches have a Reviewed-by or Acked-by.

PatchKevin WolfPaolo BonziniVladimir Sementsov-Ogievskiy
1/14R-b R-b
2/14R-b R-b R-b
3/14R-b R-b R-b
4/14R-b
5/14R-b R-b R-b
6/14R-b R-b
7/14R-b R-b
8/14R-b R-b
9/14R-b
10/14R-b
11/14R-b
12/14R-b R-b
13/14R-b R-b
14/14R-b R-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 3 reviewers.

Read the v7 thread

Cover letter [PATCH v7 00/14] Still more coroutine and various fixes in block layer

This is a dump of all minor coroutine-related fixes found while looking around and testing various things in the QEMU block layer.

Patches aim to:
- add missing coroutine_fn annotation to the functions
- simplify to avoid the typical "if in coroutine: fn()
// else create_coroutine(fn)" already present in generated_co_wraper functions.
- make sure that if a BlockDriver callback is defined as coroutine_fn, then it is always running in a coroutine.

This serie is based on Kevin Wolf's series "block: Simplify drain".

Based-on: <[email protected]>

Emanuele
---
v6:
* use different naming for block-coroutine-wrapper annotations
* fix minor typos and patch odering

v5:
* add missing reviewed-by from Paolo
* minor indentation fixes
* use when possible _co_, but do not create new g_c_w. It will be done in future series
* introduce QEMU_IN_COROUTINE
* reorder patches
* rebase on kevin block branch + v2 from "block: Simplify drain"

v4:
* use v2 commit messages
* introduce coroutine_wrapper to simplify patches

v3:
* Remove patch 1, base on kevin "drain semplification serie"

v2:
* clarified commit message in patches 2/3/6 on why we add coroutine_fn

Emanuele Giuseppe Esposito (14):
block-io: introduce coroutine_fn duplicates for
bdrv_common_block_status_above callers
block-copy: add coroutine_fn annotations
nbd/server.c: add coroutine_fn annotations
block-backend: replace bdrv_*_above with blk_*_above block/vmdk: add coroutine_fn annotations
block: avoid duplicating filename string in bdrv_create
block: distinguish between bdrv_create running in coroutine and not
block: bdrv_create_file is a coroutine_fn
block: rename generated_co_wrapper in co_wrapper_mixed block-coroutine-wrapper.py: introduce co_wrapper block-coroutine-wrapper.py: support functions without bs arg block-coroutine-wrapper.py: support also basic return types
block: convert bdrv_create to co_wrapper block/dirty-bitmap: convert coroutine-only functions to co_wrapper

 docs/devel/block-coroutine-wrapper.rst |   6 +-
 block/block-gen.h                      |  11 +--
 block/coroutines.h                     |   4 +-
 include/block/block-common.h           |  20 ++--
 include/block/block-copy.h             |   5 +-
 include/block/block-global-state.h     |  11 ++-
 include/block/block-io.h               |  69 +++++++++-----
 include/block/dirty-bitmap.h           |  10 +-
 include/sysemu/block-backend-io.h      |  77 +++++++++-------
 block.c                                |  64 +++----------
 block/block-backend.c                  |  21 +++++
 block/block-copy.c                     |  21 +++--
 block/commit.c                         |   4 +-
 block/crypto.c                         |   2 +-
 block/dirty-bitmap.c                   |  88 +-----------------
 block/io.c                             |  58 +++++++++++-
 block/parallels.c                      |   2 +-
 block/qcow.c                           |   2 +-
 block/qcow2.c                          |   4 +-
 block/qed.c                            |   2 +-
 block/raw-format.c                     |   2 +-
 block/vdi.c                            |   2 +-
 block/vhdx.c                           |   2 +-
 block/vmdk.c                           |  38 ++++----
 block/vpc.c                            |   2 +-
 nbd/server.c                           |  47 +++++-----
 block/meson.build                      |   1 +
 scripts/block-coroutine-wrapper.py     | 123 +++++++++++++++++--------
 28 files changed, 375 insertions(+), 323 deletions(-)
Signature · 1 line
2.31.1