Skip to content

block: Get rid of bdrv_swap()

Kevin Wolf qemu-devel 3 versions – Applied

Status from this message: Applied to the block branch.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest16 patches 19 repliesApplied
  2. v216 patches 21 repliesSuperseded
  3. v116 patches 51 repliesSuperseded

Changes in v3 from the cover letter

- Patch 4 ('quorum: Convert to BdrvChild')
Fixed stale comment [Max]

- Patch 7 ('block: Convert bs->backing_hd to BdrvChild') Simplified bdrv_find_overlay() [Fam]

- Patch 8 ('block: Manage backing file references in bdrv_set_backing_hd()') Fixed leaks in bdrv_drop_intermediate() [Berto]

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/16block: Introduce BDS.file_childblock.c include/block/block_int.h+10 -31 reply
2/16vmdk: Use BdrvChild instead of BDS for references to extentsblock/vmdk.c+51 -481 reply
3/16blkverify: Convert s->test_file to BdrvChildblock/blkverify.c+21 -201 reply
4/16quorum: Convert to BdrvChildblock/quorum.c+34 -311 reply
5/16block: Convert bs->file to BdrvChildblock.c block/blkdebug.c block/blkverify.c +23 more+378 -3442 replies
6/16block: Remove bdrv_open_image()block.c include/block/block.h+0 -381 reply
7/16block: Convert bs->backing_hd to BdrvChildblock.c block/io.c block/mirror.c +11 more+115 -1094 replies
8/16block: Manage backing file references in bdrv_set_backing_hd()block.c block/mirror.c block/stream.c +2 more+37 -842 replies
9/16block: Split bdrv_move_feature_fields()block.c+12 -01 reply
10/16block/io: Make bdrv_requests_pending() publicblock/io.c include/block/block_int.h+2 -10 replies
11/16block-backend: Add blk_set_bs()block/block-backend.c include/block/block_int.h+19 -00 replies
12/16block: Introduce parents listblock.c include/block/block_int.h+5 -00 replies
13/16block: Implement bdrv_append() without bdrv_swap()block.c blockdev.c+85 -293 replies
14/16blockjob: Store device name at job creationblock/mirror.c blockjob.c include/block/blockjob.h+17 -90 replies
15/16block: Add and use bdrv_replace_in_backing_chain()block.c block/mirror.c include/block/block.h +1 more+49 -260 replies
16/16block: Remove bdrv_swap()block.c block/qed.c block/vvfat.c +2 more+1 -1750 replies

Reviews trailers per patch

All 16 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMax ReitzAlberto GarciaFam ZhengJeff CodyStefan Hajnoczi
SeriesR-b
1/16R-b R-b R-b R-b
2/16R-b R-b R-b R-b
3/16R-b R-b R-b R-b
4/16R-b R-b R-b R-b
5/16R-b R-b R-b
6/16R-b R-b R-b R-b
7/16R-b R-b
8/16R-b R-b
9/16R-b R-b R-b
10/16R-b R-b R-b
11/16R-b R-b R-b
12/16R-b R-b
13/16R-b R-b
14/16R-b R-b R-b
15/16R-b R-b
16/16R-b R-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 5 reviewers.

Read the v3 thread

Cover letter [Qemu-devel] [PATCH v3 00/16] block: Get rid of bdrv_swap()

bdrv_swap() has always been an ugly hack that we would rather have avoided. When it was introduced, we simply didn't have the infrastructure to update pointers instead of transplanting the contents of BDS object, so we grudgingly added bdrv_swap() as a quick solution. Meanwhile, most of the infrastructure exists and this series implements the final step necessary to implement the required functionality in a less adventurous way.

v3:
- Patch 4 ('quorum: Convert to BdrvChild')
Fixed stale comment [Max]

- Patch 7 ('block: Convert bs->backing_hd to BdrvChild') Simplified bdrv_find_overlay() [Fam]

- Patch 8 ('block: Manage backing file references in bdrv_set_backing_hd()') Fixed leaks in bdrv_drop_intermediate() [Berto]

v2:
- Patch 4 ('quorum: Convert to BdrvChild')
Use bdrv_unref_child() instead of bdrv_unref() [Berto]

- Patch 5 ('block: Convert bs->file to BdrvChild')
bdrv_close: Set bs->drv = NULL immediately after .bdrv_close [Berto]
bdrv_close: bdrv_unref_child() instead of bdrv_unref() for bs->file [Max]

- Patch 7 ('block: Convert bs->backing_hd to BdrvChild')
Use backing_bs() more consistently instead of open-coding and introducing additional bugs while doing so [Max]

- Patch 8 ('block: Manage backing file references in bdrv_set_backing_hd()')
mirror: Use backing instead of s->base->backing->bs [Max]
stream: More simplication, remove close_unused_images() altogether [Berto]

- Patch 11 ('block-backend: Add blk_set_bs()')
assert(bs->blk == NULL) [Max]

- Patch 13 ('block: Implement bdrv_append() without bdrv_swap()') bdrv_ref/unref in change_parent_backing_link [Max] Improved throttle state handling in swap_feature_fields() [Berto] Fixed external_snapshot_commit() [Berto]

- Patch 14 ('blockjob: Store device name at job creation') Use new job->id more consistently [Max]

Kevin Wolf (16):
block: Introduce BDS.file_child
vmdk: Use BdrvChild instead of BDS for references to extents
blkverify: Convert s->test_file to BdrvChild
quorum: Convert to BdrvChild
block: Convert bs->file to BdrvChild
block: Remove bdrv_open_image()
block: Convert bs->backing_hd to BdrvChild
block: Manage backing file references in bdrv_set_backing_hd()
block: Split bdrv_move_feature_fields()
block/io: Make bdrv_requests_pending() public
block-backend: Add blk_set_bs()
block: Introduce parents list
block: Implement bdrv_append() without bdrv_swap()
blockjob: Store device name at job creation
block: Add and use bdrv_replace_in_backing_chain()
block: Remove bdrv_swap()

 block.c                   | 486 ++++++++++++++++++----------------------------
 block/blkdebug.c          |  32 +--
 block/blkverify.c         |  68 ++++---
 block/block-backend.c     |  17 ++
 block/bochs.c             |   8 +-
 block/cloop.c             |  10 +-
 block/dmg.c               |  20 +-
 block/io.c                |  76 ++++----
 block/mirror.c            |  22 +--
 block/parallels.c         |  38 ++--
 block/qapi.c              |  10 +-
 block/qcow.c              |  46 ++---
 block/qcow2-cache.c       |  11 +-
 block/qcow2-cluster.c     |  42 ++--
 block/qcow2-refcount.c    |  45 +++--
 block/qcow2-snapshot.c    |  30 +--
 block/qcow2.c             |  68 +++----
 block/qed-table.c         |   4 +-
 block/qed.c               |  51 +++--
 block/quorum.c            |  65 ++++---
 block/raw_bsd.c           |  40 ++--
 block/snapshot.c          |  12 +-
 block/stream.c            |  34 +---
 block/vdi.c               |  17 +-
 block/vhdx-log.c          |  25 +--
 block/vhdx.c              |  36 ++--
 block/vmdk.c              | 133 +++++++------
 block/vpc.c               |  34 ++--
 block/vvfat.c             |  19 +-
 blockdev.c                |   6 +-
 blockjob.c                |  15 +-
 include/block/block.h     |  15 +-
 include/block/block_int.h |  20 +-
 include/block/blockjob.h  |   8 +
 include/qemu/queue.h      |   6 -
 qemu-img.c                |  20 +-
 36 files changed, 754 insertions(+), 835 deletions(-)
Signature · 1 line
1.8.3.1