[PATCH v3 0/4] Tighten qemu-img rules on missing backing format

Eric Blake posted 4 patches 4 years ago
Failed in applying to current master (apply log)
There is a newer version of this series
docs/system/deprecated.rst    | 19 ++++++++++++++
include/block/block.h         |  4 +--
block.c                       | 34 ++++++++++++++++++++++---
block/qcow.c                  |  6 +++++
block/qcow2.c                 |  2 +-
block/sheepdog.c              |  6 +++++
block/stream.c                |  2 +-
block/vmdk.c                  |  5 ++++
blockdev.c                    |  3 ++-
qemu-img.c                    |  4 +--
tests/qemu-iotests/017        |  2 +-
tests/qemu-iotests/017.out    |  2 +-
tests/qemu-iotests/018        |  2 +-
tests/qemu-iotests/018.out    |  2 +-
tests/qemu-iotests/019        |  5 ++--
tests/qemu-iotests/019.out    |  2 +-
tests/qemu-iotests/020        |  4 +--
tests/qemu-iotests/020.out    |  4 +--
tests/qemu-iotests/024        |  8 +++---
tests/qemu-iotests/024.out    |  5 ++--
tests/qemu-iotests/028        |  4 +--
tests/qemu-iotests/028.out    |  2 +-
tests/qemu-iotests/030        | 26 +++++++++++++------
tests/qemu-iotests/034        |  2 +-
tests/qemu-iotests/034.out    |  2 +-
tests/qemu-iotests/037        |  2 +-
tests/qemu-iotests/037.out    |  2 +-
tests/qemu-iotests/038        |  2 +-
tests/qemu-iotests/038.out    |  2 +-
tests/qemu-iotests/039        |  3 ++-
tests/qemu-iotests/039.out    |  2 +-
tests/qemu-iotests/040        | 47 +++++++++++++++++++++++++----------
tests/qemu-iotests/041        | 37 ++++++++++++++++++---------
tests/qemu-iotests/042        |  4 +--
tests/qemu-iotests/043        | 18 +++++++-------
tests/qemu-iotests/043.out    | 16 +++++++-----
tests/qemu-iotests/046        |  2 +-
tests/qemu-iotests/046.out    |  2 +-
tests/qemu-iotests/050        |  4 +--
tests/qemu-iotests/050.out    |  2 +-
tests/qemu-iotests/051        |  2 +-
tests/qemu-iotests/051.out    |  2 +-
tests/qemu-iotests/051.pc.out |  2 +-
tests/qemu-iotests/056        |  3 ++-
tests/qemu-iotests/060        |  2 +-
tests/qemu-iotests/060.out    |  2 +-
tests/qemu-iotests/061        | 10 ++++----
tests/qemu-iotests/061.out    | 10 ++++----
tests/qemu-iotests/069        |  2 +-
tests/qemu-iotests/069.out    |  2 +-
tests/qemu-iotests/073        |  2 +-
tests/qemu-iotests/073.out    |  2 +-
tests/qemu-iotests/082        | 16 +++++++-----
tests/qemu-iotests/082.out    | 16 ++++++------
tests/qemu-iotests/085        |  4 +--
tests/qemu-iotests/085.out    |  6 ++---
tests/qemu-iotests/089        |  2 +-
tests/qemu-iotests/089.out    |  2 +-
tests/qemu-iotests/095        |  4 +--
tests/qemu-iotests/095.out    |  4 +--
tests/qemu-iotests/097        |  4 +--
tests/qemu-iotests/097.out    | 16 ++++++------
tests/qemu-iotests/098        |  2 +-
tests/qemu-iotests/098.out    |  8 +++---
tests/qemu-iotests/110        |  4 +--
tests/qemu-iotests/110.out    |  4 +--
tests/qemu-iotests/114        | 11 ++++++++
tests/qemu-iotests/114.out    |  8 ++++++
tests/qemu-iotests/122        | 27 ++++++++++++--------
tests/qemu-iotests/122.out    |  8 +++---
tests/qemu-iotests/126        |  4 +--
tests/qemu-iotests/126.out    |  4 +--
tests/qemu-iotests/127        |  4 +--
tests/qemu-iotests/127.out    |  4 +--
tests/qemu-iotests/129        |  3 ++-
tests/qemu-iotests/133        |  2 +-
tests/qemu-iotests/133.out    |  2 +-
tests/qemu-iotests/139        |  2 +-
tests/qemu-iotests/141        |  4 +--
tests/qemu-iotests/141.out    |  4 +--
tests/qemu-iotests/142        |  2 +-
tests/qemu-iotests/142.out    |  2 +-
tests/qemu-iotests/153        | 14 +++++------
tests/qemu-iotests/153.out    | 35 ++++++++++++++------------
tests/qemu-iotests/154        | 42 +++++++++++++++----------------
tests/qemu-iotests/154.out    | 42 +++++++++++++++----------------
tests/qemu-iotests/155        | 12 ++++++---
tests/qemu-iotests/156        |  9 ++++---
tests/qemu-iotests/156.out    |  6 ++---
tests/qemu-iotests/158        |  2 +-
tests/qemu-iotests/158.out    |  2 +-
tests/qemu-iotests/161        |  8 +++---
tests/qemu-iotests/161.out    |  8 +++---
tests/qemu-iotests/176        |  4 +--
tests/qemu-iotests/176.out    | 32 ++++++++++++------------
tests/qemu-iotests/177        |  2 +-
tests/qemu-iotests/177.out    |  2 +-
tests/qemu-iotests/179        |  2 +-
tests/qemu-iotests/179.out    |  2 +-
tests/qemu-iotests/189        |  2 +-
tests/qemu-iotests/189.out    |  2 +-
tests/qemu-iotests/191        | 12 ++++-----
tests/qemu-iotests/191.out    | 12 ++++-----
tests/qemu-iotests/195        |  6 ++---
tests/qemu-iotests/195.out    |  6 ++---
tests/qemu-iotests/198        |  2 +-
tests/qemu-iotests/198.out    |  3 ++-
tests/qemu-iotests/204        |  2 +-
tests/qemu-iotests/204.out    |  2 +-
tests/qemu-iotests/216        |  2 +-
tests/qemu-iotests/224        |  4 +--
tests/qemu-iotests/225        |  2 +-
tests/qemu-iotests/225.out    |  2 +-
tests/qemu-iotests/228        |  5 ++--
tests/qemu-iotests/245        |  3 ++-
tests/qemu-iotests/249        |  4 +--
tests/qemu-iotests/249.out    |  4 +--
tests/qemu-iotests/252        |  2 +-
tests/qemu-iotests/257        |  3 ++-
tests/qemu-iotests/267        |  4 +--
tests/qemu-iotests/267.out    |  6 ++---
tests/qemu-iotests/270        |  2 +-
tests/qemu-iotests/270.out    |  2 +-
tests/qemu-iotests/273        |  4 +--
tests/qemu-iotests/273.out    |  4 +--
tests/qemu-iotests/279        |  4 +--
tests/qemu-iotests/279.out    |  4 +--
127 files changed, 509 insertions(+), 351 deletions(-)
[PATCH v3 0/4] Tighten qemu-img rules on missing backing format
Posted by Eric Blake 4 years ago
In v3:
- patch 1 is new [Jan]
- patch 2:
  - add test 225 for vmdk [Jan]
  - add a few more tests where raw backing files are used [Peter]
- patch 3 add R-b
- patch 4:
  - more tweaks on which messages are emitted [Peter]
  - more test coverage in 114 of new messages
  - rebase to .rst conversion

Eric Blake (4):
  block: Add trivial backing_fmt support to qcow, sheepdog, vmdk
  iotests: Specify explicit backing format where sensible
  block: Add support to warn on backing file change without format
  qemu-img: Deprecate use of -b without -F

 docs/system/deprecated.rst    | 19 ++++++++++++++
 include/block/block.h         |  4 +--
 block.c                       | 34 ++++++++++++++++++++++---
 block/qcow.c                  |  6 +++++
 block/qcow2.c                 |  2 +-
 block/sheepdog.c              |  6 +++++
 block/stream.c                |  2 +-
 block/vmdk.c                  |  5 ++++
 blockdev.c                    |  3 ++-
 qemu-img.c                    |  4 +--
 tests/qemu-iotests/017        |  2 +-
 tests/qemu-iotests/017.out    |  2 +-
 tests/qemu-iotests/018        |  2 +-
 tests/qemu-iotests/018.out    |  2 +-
 tests/qemu-iotests/019        |  5 ++--
 tests/qemu-iotests/019.out    |  2 +-
 tests/qemu-iotests/020        |  4 +--
 tests/qemu-iotests/020.out    |  4 +--
 tests/qemu-iotests/024        |  8 +++---
 tests/qemu-iotests/024.out    |  5 ++--
 tests/qemu-iotests/028        |  4 +--
 tests/qemu-iotests/028.out    |  2 +-
 tests/qemu-iotests/030        | 26 +++++++++++++------
 tests/qemu-iotests/034        |  2 +-
 tests/qemu-iotests/034.out    |  2 +-
 tests/qemu-iotests/037        |  2 +-
 tests/qemu-iotests/037.out    |  2 +-
 tests/qemu-iotests/038        |  2 +-
 tests/qemu-iotests/038.out    |  2 +-
 tests/qemu-iotests/039        |  3 ++-
 tests/qemu-iotests/039.out    |  2 +-
 tests/qemu-iotests/040        | 47 +++++++++++++++++++++++++----------
 tests/qemu-iotests/041        | 37 ++++++++++++++++++---------
 tests/qemu-iotests/042        |  4 +--
 tests/qemu-iotests/043        | 18 +++++++-------
 tests/qemu-iotests/043.out    | 16 +++++++-----
 tests/qemu-iotests/046        |  2 +-
 tests/qemu-iotests/046.out    |  2 +-
 tests/qemu-iotests/050        |  4 +--
 tests/qemu-iotests/050.out    |  2 +-
 tests/qemu-iotests/051        |  2 +-
 tests/qemu-iotests/051.out    |  2 +-
 tests/qemu-iotests/051.pc.out |  2 +-
 tests/qemu-iotests/056        |  3 ++-
 tests/qemu-iotests/060        |  2 +-
 tests/qemu-iotests/060.out    |  2 +-
 tests/qemu-iotests/061        | 10 ++++----
 tests/qemu-iotests/061.out    | 10 ++++----
 tests/qemu-iotests/069        |  2 +-
 tests/qemu-iotests/069.out    |  2 +-
 tests/qemu-iotests/073        |  2 +-
 tests/qemu-iotests/073.out    |  2 +-
 tests/qemu-iotests/082        | 16 +++++++-----
 tests/qemu-iotests/082.out    | 16 ++++++------
 tests/qemu-iotests/085        |  4 +--
 tests/qemu-iotests/085.out    |  6 ++---
 tests/qemu-iotests/089        |  2 +-
 tests/qemu-iotests/089.out    |  2 +-
 tests/qemu-iotests/095        |  4 +--
 tests/qemu-iotests/095.out    |  4 +--
 tests/qemu-iotests/097        |  4 +--
 tests/qemu-iotests/097.out    | 16 ++++++------
 tests/qemu-iotests/098        |  2 +-
 tests/qemu-iotests/098.out    |  8 +++---
 tests/qemu-iotests/110        |  4 +--
 tests/qemu-iotests/110.out    |  4 +--
 tests/qemu-iotests/114        | 11 ++++++++
 tests/qemu-iotests/114.out    |  8 ++++++
 tests/qemu-iotests/122        | 27 ++++++++++++--------
 tests/qemu-iotests/122.out    |  8 +++---
 tests/qemu-iotests/126        |  4 +--
 tests/qemu-iotests/126.out    |  4 +--
 tests/qemu-iotests/127        |  4 +--
 tests/qemu-iotests/127.out    |  4 +--
 tests/qemu-iotests/129        |  3 ++-
 tests/qemu-iotests/133        |  2 +-
 tests/qemu-iotests/133.out    |  2 +-
 tests/qemu-iotests/139        |  2 +-
 tests/qemu-iotests/141        |  4 +--
 tests/qemu-iotests/141.out    |  4 +--
 tests/qemu-iotests/142        |  2 +-
 tests/qemu-iotests/142.out    |  2 +-
 tests/qemu-iotests/153        | 14 +++++------
 tests/qemu-iotests/153.out    | 35 ++++++++++++++------------
 tests/qemu-iotests/154        | 42 +++++++++++++++----------------
 tests/qemu-iotests/154.out    | 42 +++++++++++++++----------------
 tests/qemu-iotests/155        | 12 ++++++---
 tests/qemu-iotests/156        |  9 ++++---
 tests/qemu-iotests/156.out    |  6 ++---
 tests/qemu-iotests/158        |  2 +-
 tests/qemu-iotests/158.out    |  2 +-
 tests/qemu-iotests/161        |  8 +++---
 tests/qemu-iotests/161.out    |  8 +++---
 tests/qemu-iotests/176        |  4 +--
 tests/qemu-iotests/176.out    | 32 ++++++++++++------------
 tests/qemu-iotests/177        |  2 +-
 tests/qemu-iotests/177.out    |  2 +-
 tests/qemu-iotests/179        |  2 +-
 tests/qemu-iotests/179.out    |  2 +-
 tests/qemu-iotests/189        |  2 +-
 tests/qemu-iotests/189.out    |  2 +-
 tests/qemu-iotests/191        | 12 ++++-----
 tests/qemu-iotests/191.out    | 12 ++++-----
 tests/qemu-iotests/195        |  6 ++---
 tests/qemu-iotests/195.out    |  6 ++---
 tests/qemu-iotests/198        |  2 +-
 tests/qemu-iotests/198.out    |  3 ++-
 tests/qemu-iotests/204        |  2 +-
 tests/qemu-iotests/204.out    |  2 +-
 tests/qemu-iotests/216        |  2 +-
 tests/qemu-iotests/224        |  4 +--
 tests/qemu-iotests/225        |  2 +-
 tests/qemu-iotests/225.out    |  2 +-
 tests/qemu-iotests/228        |  5 ++--
 tests/qemu-iotests/245        |  3 ++-
 tests/qemu-iotests/249        |  4 +--
 tests/qemu-iotests/249.out    |  4 +--
 tests/qemu-iotests/252        |  2 +-
 tests/qemu-iotests/257        |  3 ++-
 tests/qemu-iotests/267        |  4 +--
 tests/qemu-iotests/267.out    |  6 ++---
 tests/qemu-iotests/270        |  2 +-
 tests/qemu-iotests/270.out    |  2 +-
 tests/qemu-iotests/273        |  4 +--
 tests/qemu-iotests/273.out    |  4 +--
 tests/qemu-iotests/279        |  4 +--
 tests/qemu-iotests/279.out    |  4 +--
 127 files changed, 509 insertions(+), 351 deletions(-)

-- 
2.25.1