Skip to content

Fix some filename generation issues

Max Reitz qemu-devel 13 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v13 Latest31 patches 3 repliesIn review
  2. v1231 patches 3 repliesSuperseded
  3. v1131 patches 9 repliesSuperseded
Earlier versions · 10
VersionPostedPatchesRepliesStatus
v1031 patches34 repliesSuperseded
v931 patches20 repliesSuperseded
v826 patches26 repliesSuperseded
v725 patches24 repliesSuperseded
v625 patches26 repliesSuperseded
v525 patches3 repliesSuperseded
v425 patches11 repliesSuperseded
v325 patches10 repliesSuperseded
v224 patches1 replySuperseded
v119 patches21 repliesSuperseded

v12 from the cover letter

- Patch 6: We need a filter_qmp_imgfmt() now, too
- Patch 8:
- We need to explicitly specify the testfiles filter every time we need it (now)
- We need qmp filters for qmp_log()
- Turns out this test doesn't pass before patch 24, so put a FIXME in for now and adjust the reference output to make it pass
- Some s/_/-/ in the reference output
- Patch 10: Rebase conflicts resolved
- Patch 23: Turns out this changes iotest 228's output (which was added in patch 8) from "pretty wrong" to "less wrong". Adjust the FIXME and the reference output.
- Patch 24:
- This one finally fixes 228, so remove the FIXME and revert the reference output to what it should be.
- Rebase conflicts resolved
- Patch 31:
- We need qmp filters for qmp_log()
- Some s/_/-/ in the reference output

Patches in v13 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/31block: Use bdrv_refresh_filename() to pullblock.c block/qapi.c block/raw-format.c +6 more+44 -211 reply
2/31block: Use children list in bdrv_refresh_filenameblock.c block/blklogwrites.c block/blkverify.c +3 more+5 -130 replies
3/31block: Skip implicit nodes for filename infoblock.c+14 -00 replies
4/31block: Add BDS.auto_backing_fileblock.c block/qcow.c block/qcow2.c +3 more+44 -90 replies
5/31block: Respect backing bs in bdrv_refresh_filenameblock.c tests/qemu-iotests/051.out tests/qemu-iotests/051.pc.out+45 -90 replies
6/31iotests.py: Add filter_imgfmt()tests/qemu-iotests/iotests.py+10 -01 reply
7/31iotests.py: Add node_info()tests/qemu-iotests/iotests.py+7 -00 replies
8/31iotests: Add test for backing file overridestests/qemu-iotests/228 tests/qemu-iotests/228.out tests/qemu-iotests/group+327 -00 replies
9/31block: Make path_combine() return the pathblock.c block/vmdk.c include/block/block.h+49 -430 replies
10/31block: bdrv_get_full_backing_filename_from_...'s ret. val.block.c block/vmdk.c include/block/block.h +1 more+49 -330 replies
11/31block: bdrv_get_full_backing_filename's ret. val.block.c block/qapi.c include/block/block.h+20 -430 replies
12/31block: Add bdrv_make_absolute_filename()block.c+20 -70 replies
13/31block: Fix bdrv_find_backing_image()block.c+10 -230 replies
14/31block: Add bdrv_dirname()block.c include/block/block.h include/block/block_int.h+35 -00 replies
15/31blkverify: Make bdrv_dirname() return NULLblock/blkverify.c+10 -00 replies
16/31quorum: Make bdrv_dirname() return NULLblock/quorum.c+11 -00 replies
17/31block/nbd: Make bdrv_dirname() return NULLblock/nbd.c+13 -00 replies
18/31block/nfs: Implement bdrv_dirname()block/nfs.c+15 -00 replies
19/31block: Use bdrv_dirname() for relative filenamesblock.c tests/qemu-iotests/110 tests/qemu-iotests/110.out+16 -90 replies
20/31iotests: Add quorum case to test 110tests/qemu-iotests/110 tests/qemu-iotests/110.out+33 -00 replies
21/31block: Add strong_runtime_opts to BlockDriverblock/blkdebug.c block/blklogwrites.c block/crypto.c +20 more+256 -10 replies
22/31block: Add BlockDriver.bdrv_gather_child_optionsblock/quorum.c block/vmdk.c include/block/block_int.h+83 -00 replies
23/31block: Generically refresh runtime optionsblock.c tests/qemu-iotests/110.out tests/qemu-iotests/228 +1 more+121 -60 replies
24/31block: Purify .bdrv_refresh_filename()block.c block/blkdebug.c block/blklogwrites.c +11 more+81 -2910 replies
25/31block: Do not copy exact_filename from format fileblock.c+15 -30 replies
26/31block/nvme: Fix bdrv_refresh_filename()block/nvme.c+9 -140 replies
27/31block/curl: Harmonize option defaultsblock/curl.c+8 -50 replies
28/31block/curl: Implement bdrv_refresh_filename()block/curl.c+21 -00 replies
29/31block/null: Generate filename even with latency-nsblock/null.c+2 -10 replies
30/31block: BDS options may lack the "driver" optionblock.c+6 -00 replies
31/31iotests: Test json:{} filenames of internal BDSstests/qemu-iotests/224 tests/qemu-iotests/224.out tests/qemu-iotests/group+158 -00 replies

Reviews trailers per patch

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

PatchEric BlakeAlberto GarciaJohn SnowKevin Wolf
1/31R-b
2/31R-b R-b
3/31R-b R-b
4/31R-b R-b
5/31R-b
6/31R-b
7/31R-b R-b R-b
8/31
9/31R-b R-b
10/31
11/31R-b
12/31R-b
13/31R-b
14/31R-b
15/31R-b R-b
16/31R-b R-b
17/31R-b R-b
18/31R-b
19/31R-b
20/31R-b
21/31R-b
22/31R-b
23/31
24/31
25/31R-b
26/31R-b
27/31R-b
28/31R-b
29/31R-b
30/31R-b
31/31

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

Read the v13 thread

Cover letter [Qemu-devel] [PATCH v13 00/31] Fix some filename generation issues

Once more, I’ll spare both me and you another iteration of the cover letter, so I direct you to the previous version’s cover letter (which will direct you further):

http://lists.nongnu.org/archive/html/qemu-block/2018-10/msg00229.html

There are mostly rebase fixes in this version. Provided no major complaints arise, I intend to merge this series in the next week or so.

v12:
- Patch 6: We need a filter_qmp_imgfmt() now, too
- Patch 8:
- We need to explicitly specify the testfiles filter every time we need it (now)
- We need qmp filters for qmp_log()
- Turns out this test doesn't pass before patch 24, so put a FIXME in for now and adjust the reference output to make it pass
- Some s/_/-/ in the reference output
- Patch 10: Rebase conflicts resolved
- Patch 23: Turns out this changes iotest 228's output (which was added in patch 8) from "pretty wrong" to "less wrong". Adjust the FIXME and the reference output.
- Patch 24:
- This one finally fixes 228, so remove the FIXME and revert the reference output to what it should be.
- Rebase conflicts resolved
- Patch 31:
- We need qmp filters for qmp_log()
- Some s/_/-/ in the reference output

So altogether, the only real (non-rebase-inflicted) change is that I noticed that 228 is broken before patch 24, and decided to keep it where it was to illustrate how this series fixes the issue.

git-backport-diff against v12:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/31:[----] [--] 'block: Use bdrv_refresh_filename() to pull' 002/31:[----] [--] 'block: Use children list in bdrv_refresh_filename' 003/31:[----] [--] 'block: Skip implicit nodes for filename info' 004/31:[----] [--] 'block: Add BDS.auto_backing_file' 005/31:[----] [--] 'block: Respect backing bs in bdrv_refresh_filename' 006/31:[0007] [FC] 'iotests.py: Add filter_imgfmt()'
007/31:[----] [--] 'iotests.py: Add node_info()'
008/31:[0063] [FC] 'iotests: Add test for backing file overrides' 009/31:[----] [--] 'block: Make path_combine() return the path' 010/31:[0005] [FC] 'block: bdrv_get_full_backing_filename_from_...'s ret. val.' 011/31:[----] [--] 'block: bdrv_get_full_backing_filename's ret. val.' 012/31:[----] [--] 'block: Add bdrv_make_absolute_filename()' 013/31:[----] [--] 'block: Fix bdrv_find_backing_image()' 014/31:[----] [--] 'block: Add bdrv_dirname()'
015/31:[----] [--] 'blkverify: Make bdrv_dirname() return NULL' 016/31:[----] [--] 'quorum: Make bdrv_dirname() return NULL' 017/31:[----] [--] 'block/nbd: Make bdrv_dirname() return NULL' 018/31:[----] [--] 'block/nfs: Implement bdrv_dirname()' 019/31:[----] [--] 'block: Use bdrv_dirname() for relative filenames' 020/31:[----] [--] 'iotests: Add quorum case to test 110' 021/31:[----] [--] 'block: Add strong_runtime_opts to BlockDriver' 022/31:[----] [--] 'block: Add BlockDriver.bdrv_gather_child_options' 023/31:[0009] [FC] 'block: Generically refresh runtime options' 024/31:[0011] [FC] 'block: Purify .bdrv_refresh_filename()' 025/31:[----] [--] 'block: Do not copy exact_filename from format file' 026/31:[----] [--] 'block/nvme: Fix bdrv_refresh_filename()' 027/31:[----] [--] 'block/curl: Harmonize option defaults' 028/31:[----] [--] 'block/curl: Implement bdrv_refresh_filename()' 029/31:[----] [--] 'block/null: Generate filename even with latency-ns' 030/31:[----] [--] 'block: BDS options may lack the "driver" option' 031/31:[0018] [FC] 'iotests: Test json:{} filenames of internal BDSs'

Max Reitz (31):
block: Use bdrv_refresh_filename() to pull
block: Use children list in bdrv_refresh_filename
block: Skip implicit nodes for filename info
block: Add BDS.auto_backing_file
block: Respect backing bs in bdrv_refresh_filename iotests.py: Add filter_imgfmt()
iotests.py: Add node_info()
iotests: Add test for backing file overrides
block: Make path_combine() return the path
block: bdrv_get_full_backing_filename_from_...'s ret. val.
block: bdrv_get_full_backing_filename's ret. val.
block: Add bdrv_make_absolute_filename()
block: Fix bdrv_find_backing_image()
block: Add bdrv_dirname()
blkverify: Make bdrv_dirname() return NULL
quorum: Make bdrv_dirname() return NULL block/nbd: Make bdrv_dirname() return NULL block/nfs: Implement bdrv_dirname()
block: Use bdrv_dirname() for relative filenames
iotests: Add quorum case to test 110
block: Add strong_runtime_opts to BlockDriver
block: Add BlockDriver.bdrv_gather_child_options
block: Generically refresh runtime options
block: Purify .bdrv_refresh_filename()
block: Do not copy exact_filename from format file block/nvme: Fix bdrv_refresh_filename() block/curl: Harmonize option defaults block/curl: Implement bdrv_refresh_filename() block/null: Generate filename even with latency-ns
block: BDS options may lack the "driver" option
iotests: Test json:{} filenames of internal BDSs

 include/block/block.h         |  16 +-
 include/block/block_int.h     |  48 +++-
 block.c                       | 503 ++++++++++++++++++++++------------
 block/blkdebug.c              |  70 ++---
 block/blklogwrites.c          |  33 +--
 block/blkverify.c             |  29 +-
 block/commit.c                |   3 +-
 block/crypto.c                |   8 +
 block/curl.c                  |  55 +++-
 block/gluster.c               |  19 ++
 block/iscsi.c                 |  18 ++
 block/mirror.c                |   3 +-
 block/nbd.c                   |  46 ++--
 block/nfs.c                   |  54 ++--
 block/null.c                  |  32 ++-
 block/nvme.c                  |  27 +-
 block/qapi.c                  |  16 +-
 block/qcow.c                  |  14 +-
 block/qcow2.c                 |  17 +-
 block/qed.c                   |   7 +-
 block/quorum.c                |  71 +++--
 block/raw-format.c            |  11 +-
 block/rbd.c                   |  14 +
 block/replication.c           |  10 +-
 block/sheepdog.c              |  12 +
 block/ssh.c                   |  12 +
 block/throttle.c              |   7 +
 block/vhdx-log.c              |   1 +
 block/vmdk.c                  |  44 ++-
 block/vpc.c                   |   7 +
 block/vvfat.c                 |  12 +
 block/vxhs.c                  |  11 +
 blockdev.c                    |   8 +
 qemu-img.c                    |  23 +-
 tests/qemu-iotests/051.out    |   8 +-
 tests/qemu-iotests/051.pc.out |   8 +-
 tests/qemu-iotests/110        |  29 +-
 tests/qemu-iotests/110.out    |   9 +-
 tests/qemu-iotests/224        | 139 ++++++++++
 tests/qemu-iotests/224.out    |  18 ++
 tests/qemu-iotests/228        | 239 ++++++++++++++++
 tests/qemu-iotests/228.out    |  84 ++++++
 tests/qemu-iotests/group      |   2 +
 tests/qemu-iotests/iotests.py |  17 ++
 44 files changed, 1410 insertions(+), 404 deletions(-)
 create mode 100755 tests/qemu-iotests/224
 create mode 100644 tests/qemu-iotests/224.out
 create mode 100755 tests/qemu-iotests/228
 create mode 100644 tests/qemu-iotests/228.out
Signature · 1 line
2.20.1