This is split out and updated based on comments on my RFC series bumping
minimum supported qemu version to 3.1.

- commit 1 is new
- commit 2 is a separated update to 'disk-error-policy' case as pure
  update to 4.1 (as with others) would camouflage changes in placing of
  rerror/werror properties
- commit 3 is a separated update to test cases having 'device_id' of
  SCSI disk due to same reason as above
- commit 4 is now an update of disk test cases using qemu-2.12 caps to
  qemu 4.1 caps. Now only test cases which which are not related to
  disks are contained in this commit
- commit 5 is a similar update to a sev test case that was missing

Peter Krempa (5):
  qemu: command: Inline qemuBuildDiskFrontendAttributeErrorPolicy
  qemuxml2argvtest: Add pre-blockdev post-werror-move version of
    'disk-error-policy'
  qemuxml2argvtest: Update disk test cases having 'device_id' argument
    of SCSI disk
  qemuxml2argvtest: Bump versioned test variants for pre-blockdev disk
    tests to 4.1.0
  qemuxml2argvtest: Add newer variant of
    'launch-security-sev-missing-platform-info'

 src/qemu/qemu_command.c                       | 29 ++++------
 ...2.12.0.args => disk-aio.x86_64-4.1.0.args} |  4 +-
 ...sk-backing-chains-index.x86_64-2.12.0.args |  1 -
 ...sk-backing-chains-index.x86_64-4.1.0.args} |  4 +-
 ...k-backing-chains-noindex.x86_64-4.1.0.args |  1 +
 ...12.0.args => disk-cache.x86_64-3.1.0.args} |  4 +-
 .../disk-cache.x86_64-4.1.0.args              | 42 +++++++++++++++
 ...s => disk-cdrom-network.x86_64-4.1.0.args} |  4 +-
 ...args => disk-cdrom-tray.x86_64-4.1.0.args} |  4 +-
 ...12.0.args => disk-cdrom.x86_64-4.1.0.args} |  4 +-
 ...gs => disk-copy_on_read.x86_64-4.1.0.args} |  4 +-
 ...s => disk-detect-zeroes.x86_64-4.1.0.args} |  4 +-
 .../disk-error-policy-s390x.s390x-4.0.0.args  | 35 ++++++++++++
 .../disk-error-policy.x86_64-4.1.0.args       | 37 +++++++++++++
 ...args => disk-floppy-q35.x86_64-4.1.0.args} |  4 +-
 ...2.0.args => disk-floppy.x86_64-4.1.0.args} |  4 +-
 ...=> disk-network-gluster.x86_64-4.1.0.args} |  4 +-
 ...s => disk-network-iscsi.x86_64-4.1.0.args} |  4 +-
 ...rgs => disk-network-nbd.x86_64-4.1.0.args} |  4 +-
 ...rgs => disk-network-rbd.x86_64-4.1.0.args} |  4 +-
 ...> disk-network-sheepdog.x86_64-4.1.0.args} |  4 +-
 ...isk-network-source-auth.x86_64-4.1.0.args} |  4 +-
 ...isk-network-tlsx509-nbd.x86_64-4.1.0.args} |  4 +-
 ...sk-network-tlsx509-vxhs.x86_64-4.1.0.args} |  4 +-
 ...s => disk-readonly-disk.x86_64-4.1.0.args} |  4 +-
 ...2.0.args => disk-shared.x86_64-3.1.0.args} |  4 +-
 .../disk-shared.x86_64-4.1.0.args             | 41 ++++++++++++++
 ...irtio-scsi-reservations.x86_64-4.1.0.args} |  4 +-
 ...rgs => floppy-drive-fat.x86_64-4.1.0.args} |  4 +-
 ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++
 tests/qemuxml2argvtest.c                      | 53 +++++++++++--------
 31 files changed, 278 insertions(+), 86 deletions(-)
 rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args => disk-aio.x86_64-4.1.0.args} (94%)
 delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
 rename tests/qemuxml2argvdata/{disk-backing-chains-noindex.x86_64-2.12.0.args => disk-backing-chains-index.x86_64-4.1.0.args} (96%)
 create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
 rename tests/qemuxml2argvdata/{disk-cache.x86_64-2.12.0.args => disk-cache.x86_64-3.1.0.args} (96%)
 create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
 rename tests/qemuxml2argvdata/{disk-cdrom-network.x86_64-2.12.0.args => disk-cdrom-network.x86_64-4.1.0.args} (94%)
 rename tests/qemuxml2argvdata/{disk-cdrom-tray.x86_64-2.12.0.args => disk-cdrom-tray.x86_64-4.1.0.args} (94%)
 rename tests/qemuxml2argvdata/{disk-cdrom.x86_64-2.12.0.args => disk-cdrom.x86_64-4.1.0.args} (94%)
 rename tests/qemuxml2argvdata/{disk-copy_on_read.x86_64-2.12.0.args => disk-copy_on_read.x86_64-4.1.0.args} (95%)
 rename tests/qemuxml2argvdata/{disk-detect-zeroes.x86_64-2.12.0.args => disk-detect-zeroes.x86_64-4.1.0.args} (94%)
 create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
 create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
 rename tests/qemuxml2argvdata/{disk-floppy-q35.x86_64-2.12.0.args => disk-floppy-q35.x86_64-4.1.0.args} (94%)
 rename tests/qemuxml2argvdata/{disk-floppy.x86_64-2.12.0.args => disk-floppy.x86_64-4.1.0.args} (94%)
 rename tests/qemuxml2argvdata/{disk-network-gluster.x86_64-2.12.0.args => disk-network-gluster.x86_64-4.1.0.args} (95%)
 rename tests/qemuxml2argvdata/{disk-network-iscsi.x86_64-2.12.0.args => disk-network-iscsi.x86_64-4.1.0.args} (97%)
 rename tests/qemuxml2argvdata/{disk-network-nbd.x86_64-2.12.0.args => disk-network-nbd.x86_64-4.1.0.args} (95%)
 rename tests/qemuxml2argvdata/{disk-network-rbd.x86_64-2.12.0.args => disk-network-rbd.x86_64-4.1.0.args} (97%)
 rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-2.12.0.args => disk-network-sheepdog.x86_64-4.1.0.args} (94%)
 rename tests/qemuxml2argvdata/{disk-network-source-auth.x86_64-2.12.0.args => disk-network-source-auth.x86_64-4.1.0.args} (96%)
 rename tests/qemuxml2argvdata/{disk-network-tlsx509-nbd.x86_64-2.12.0.args => disk-network-tlsx509-nbd.x86_64-4.1.0.args} (95%)
 rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-2.12.0.args => disk-network-tlsx509-vxhs.x86_64-4.1.0.args} (97%)
 rename tests/qemuxml2argvdata/{disk-readonly-disk.x86_64-2.12.0.args => disk-readonly-disk.x86_64-4.1.0.args} (94%)
 rename tests/qemuxml2argvdata/{disk-shared.x86_64-2.12.0.args => disk-shared.x86_64-3.1.0.args} (95%)
 create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
 rename tests/qemuxml2argvdata/{disk-virtio-scsi-reservations.x86_64-2.12.0.args => disk-virtio-scsi-reservations.x86_64-4.1.0.args} (95%)
 rename tests/qemuxml2argvdata/{floppy-drive-fat.x86_64-2.12.0.args => floppy-drive-fat.x86_64-4.1.0.args} (93%)
 create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args

-- 
2.34.1

On a Monday in 2022, Peter Krempa wrote:
>Peter Krempa (5):
>  qemu: command: Inline qemuBuildDiskFrontendAttributeErrorPolicy
>  qemuxml2argvtest: Add pre-blockdev post-werror-move version of
>    'disk-error-policy'
>  qemuxml2argvtest: Update disk test cases having 'device_id' argument
>    of SCSI disk
>  qemuxml2argvtest: Bump versioned test variants for pre-blockdev disk
>    tests to 4.1.0
>  qemuxml2argvtest: Add newer variant of
>    'launch-security-sev-missing-platform-info'
>
> src/qemu/qemu_command.c                       | 29 ++++------
> ...2.12.0.args => disk-aio.x86_64-4.1.0.args} |  4 +-

[...]

> ...rgs => floppy-drive-fat.x86_64-4.1.0.args} |  4 +-
> ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++
> tests/qemuxml2argvtest.c                      | 53 +++++++++++--------
> 31 files changed, 278 insertions(+), 86 deletions(-)
> rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args => disk-aio.x86_64-4.1.0.args} (94%)
> delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args

[...]

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano