[PATCH 0/7] qemu capability testing cleanups and improvements (part 4)

[Peter Krempa]

 This series applies on top of 'part3' fetch everything from my repo:

 git fetch https://gitlab.com/pipo.sk/libvirt.git s390-send

In this part tests for the 's390' platform are converted to use real
capabilities.

Peter Krempa (7):
  qemuxml2argvtest: Remove obsolete negative tests
  qemuxml2argvtest: Modernize all s390 'keywrap' tests
  qemuxml2argvtest: Modernize all s390 'loadparm' tests
  qemuxml2argvtest: Modernize s390 cpu tests
  qemuxml2argvtest: Convert rest of s390 tests to real caps
  qemuxml2xmltest: Convert all s390 test cases to real capabilities
  testutilsqemu: Drop fake capability testing infrastructure for 's390'

 tests/qemuxml2argvdata/cpu-s390-features.err  |   1 -
 ...gs => cpu-s390-features.s390x-latest.args} |   6 +-
 ....args => cpu-s390-zEC12.s390x-latest.args} |   6 +-
 ...dev-scsi-vhost-scsi-ccw.s390x-latest.args} |   7 +-
 ...io-ccw-duplicate-address.s390x-latest.err} |   0
 ...vfio-ccw-invalid-address.s390x-latest.err} |   0
 .../hostdev-subsys-mdev-vfio-ccw.err          |   1 -
 .../hostdev-vfio-zpci-autogenerate-fids.err   |   1 -
 ...ev-vfio-zpci-boundaries.s390x-latest.args} |   7 +-
 ...tdev-vfio-zpci-duplicate.s390x-latest.err} |   0
 ...stdev-vfio-zpci-set-zero.s390x-latest.err} |   0
 ...v-vfio-zpci-uid-set-zero.s390x-latest.err} |   0
 tests/qemuxml2argvdata/hostdev-vfio-zpci.err  |   1 -
 ...gs => hostdev-vfio-zpci.s390x-latest.args} |   7 +-
 ...rgs => input-virtio-ccw.s390x-latest.args} |   7 +-
 ...hine-aeskeywrap-off-cap.s390x-latest.args} |   7 +-
 ...ine-aeskeywrap-off-caps.s390x-latest.args} |   7 +-
 ...chine-aeskeywrap-on-cap.s390x-latest.args} |   7 +-
 ...hine-aeskeywrap-on-caps.s390x-latest.args} |   7 +-
 ...hine-deakeywrap-off-cap.s390x-latest.args} |   7 +-
 ...ine-deakeywrap-off-caps.s390x-latest.args} |   7 +-
 ...chine-deakeywrap-on-cap.s390x-latest.args} |   7 +-
 ...hine-deakeywrap-on-caps.s390x-latest.args} |   7 +-
 .../machine-keywrap-none-caps.args            |  31 -----
 ...achine-keywrap-none-caps.s390x-latest.args |  34 +++++
 .../machine-keywrap-none.args                 |  31 -----
 .../machine-keywrap-none.s390x-latest.args    |  34 +++++
 ...ultiple-disks-nets-s390.s390x-latest.args} |   7 +-
 ...chine-loadparm-net-s390.s390x-latest.args} |   7 +-
 ...> machine-loadparm-s390.s390x-latest.args} |   7 +-
 ....err => s390-no-parallel.s390x-latest.err} |   0
 ...rr => s390-panic-address.s390x-latest.err} |   0
 ...s => s390-panic-missing.s390x-latest.args} |   7 +-
 ...> s390-panic-no-address.s390x-latest.args} |   7 +-
 ...2.args => s390-serial-2.s390x-latest.args} |   7 +-
 ... => s390-serial-console.s390x-latest.args} |   7 +-
 ...ial.args => s390-serial.s390x-latest.args} |   7 +-
 ...=> video-virtio-gpu-ccw.s390x-latest.args} |   7 +-
 tests/qemuxml2argvtest.c                      | 130 +++++-------------
 ...=> disk-virtio-s390-zpci.s390x-latest.xml} |   3 +
 ...tdev-scsi-vhost-scsi-ccw.s390x-latest.xml} |   4 +
 ...tdev-subsys-mdev-vfio-ap.s390x-latest.xml} |   4 +
 ...dev-subsys-mdev-vfio-ccw.s390x-latest.xml} |   4 +
 ...o-zpci-autogenerate-fids.s390x-latest.xml} |   3 +
 ...o-zpci-autogenerate-uids.s390x-latest.xml} |   3 +
 ...v-vfio-zpci-autogenerate.s390x-latest.xml} |   3 +
 ...dev-vfio-zpci-boundaries.s390x-latest.xml} |   3 +
 ...vfio-zpci-ccw-memballoon.s390x-latest.xml} |   1 +
 ...io-zpci-multidomain-many.s390x-latest.xml} |   3 +
 ...xml => hostdev-vfio-zpci.s390x-latest.xml} |   3 +
 ....xml => input-virtio-ccw.s390x-latest.xml} |   4 +
 ...multiple-disks-nets-s390.s390x-latest.xml} |   4 +
 ...ml => s390-panic-missing.s390x-latest.xml} |   4 +
 ...=> s390-panic-no-address.s390x-latest.xml} |   4 +
 ...-panic.xml => s390-panic.s390x-latest.xml} |   2 +
 ...l-2.xml => s390-serial-2.s390x-latest.xml} |   4 +
 ...l => s390-serial-console.s390x-latest.xml} |   4 +
 ...nsole.xml => s390-serial.s390x-latest.xml} |   4 +
 ... => vhost-vsock-ccw-auto.s390x-latest.xml} |   4 +
 .../vhost-vsock-ccw.s390x-latest.xml          |  37 +++++
 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml  |   1 -
 ...ideo-virtio-gpu-ccw-auto.s390x-latest.xml} |   4 +
 ... => video-virtio-gpu-ccw.s390x-latest.xml} |   4 +
 tests/qemuxml2xmltest.c                       |  81 ++++-------
 tests/testutilsqemu.c                         |   6 -
 65 files changed, 355 insertions(+), 269 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/cpu-s390-features.err
 rename tests/qemuxml2argvdata/{cpu-s390-features.args => cpu-s390-features.s390x-latest.args} (68%)
 rename tests/qemuxml2argvdata/{cpu-s390-zEC12.args => cpu-s390-zEC12.s390x-latest.args} (67%)
 rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-ccw.args => hostdev-scsi-vhost-scsi-ccw.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-duplicate-address.err => hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-invalid-address.err => hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err
 delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err
 rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-boundaries.args => hostdev-vfio-zpci-boundaries.s390x-latest.args} (75%)
 rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-duplicate.err => hostdev-vfio-zpci-duplicate.s390x-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-set-zero.err => hostdev-vfio-zpci-set-zero.s390x-latest.err} (100%)
 rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-uid-set-zero.err => hostdev-vfio-zpci-uid-set-zero.s390x-latest.err} (100%)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.err
 rename tests/qemuxml2argvdata/{hostdev-vfio-zpci.args => hostdev-vfio-zpci.s390x-latest.args} (71%)
 rename tests/qemuxml2argvdata/{input-virtio-ccw.args => input-virtio-ccw.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-caps.args => machine-aeskeywrap-off-cap.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-cap.args => machine-aeskeywrap-off-caps.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-cap.args => machine-aeskeywrap-on-cap.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-caps.args => machine-aeskeywrap-on-caps.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-deakeywrap-off-cap.args => machine-deakeywrap-off-cap.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-deakeywrap-off-caps.args => machine-deakeywrap-off-caps.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-deakeywrap-on-cap.args => machine-deakeywrap-on-cap.s390x-latest.args} (77%)
 rename tests/qemuxml2argvdata/{machine-deakeywrap-on-caps.args => machine-deakeywrap-on-caps.s390x-latest.args} (77%)
 delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.args
 create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args
 delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.args
 create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args
 rename tests/qemuxml2argvdata/{machine-loadparm-multiple-disks-nets-s390.args => machine-loadparm-multiple-disks-nets-s390.s390x-latest.args} (81%)
 rename tests/qemuxml2argvdata/{machine-loadparm-net-s390.args => machine-loadparm-net-s390.s390x-latest.args} (70%)
 rename tests/qemuxml2argvdata/{machine-loadparm-s390.args => machine-loadparm-s390.s390x-latest.args} (74%)
 rename tests/qemuxml2argvdata/{s390-no-parallel.err => s390-no-parallel.s390x-latest.err} (100%)
 rename tests/qemuxml2argvdata/{s390-panic-address.err => s390-panic-address.s390x-latest.err} (100%)
 rename tests/qemuxml2argvdata/{s390-panic-missing.args => s390-panic-missing.s390x-latest.args} (72%)
 rename tests/qemuxml2argvdata/{s390-panic-no-address.args => s390-panic-no-address.s390x-latest.args} (71%)
 rename tests/qemuxml2argvdata/{s390-serial-2.args => s390-serial-2.s390x-latest.args} (71%)
 rename tests/qemuxml2argvdata/{s390-serial-console.args => s390-serial-console.s390x-latest.args} (69%)
 rename tests/qemuxml2argvdata/{s390-serial.args => s390-serial.s390x-latest.args} (69%)
 rename tests/qemuxml2argvdata/{video-virtio-gpu-ccw.args => video-virtio-gpu-ccw.s390x-latest.args} (77%)
 rename tests/qemuxml2xmloutdata/{disk-virtio-s390-zpci.xml => disk-virtio-s390-zpci.s390x-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml} (89%)
 rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ap.xml => hostdev-subsys-mdev-vfio-ap.s390x-latest.xml} (85%)
 rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ccw.xml => hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml} (85%)
 rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-fids.xml => hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml} (93%)
 rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-uids.xml => hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml} (93%)
 rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate.xml => hostdev-vfio-zpci-autogenerate.s390x-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-boundaries.xml => hostdev-vfio-zpci-boundaries.s390x-latest.xml} (94%)
 rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-ccw-memballoon.xml => hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml} (96%)
 rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-multidomain-many.xml => hostdev-vfio-zpci-multidomain-many.s390x-latest.xml} (97%)
 rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci.xml => hostdev-vfio-zpci.s390x-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{input-virtio-ccw.xml => input-virtio-ccw.s390x-latest.xml} (89%)
 rename tests/qemuxml2xmloutdata/{machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{s390-panic-missing.xml => s390-panic-missing.s390x-latest.xml} (86%)
 rename tests/qemuxml2xmloutdata/{s390-panic-no-address.xml => s390-panic-no-address.s390x-latest.xml} (85%)
 rename tests/qemuxml2xmloutdata/{s390-panic.xml => s390-panic.s390x-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{s390-serial-2.xml => s390-serial-2.s390x-latest.xml} (86%)
 rename tests/qemuxml2xmloutdata/{s390-serial.xml => s390-serial-console.s390x-latest.xml} (84%)
 rename tests/qemuxml2xmloutdata/{s390-serial-console.xml => s390-serial.s390x-latest.xml} (84%)
 rename tests/qemuxml2xmloutdata/{vhost-vsock-ccw-auto.xml => vhost-vsock-ccw-auto.s390x-latest.xml} (87%)
 create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml
 delete mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
 rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw-auto.xml => video-virtio-gpu-ccw-auto.s390x-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw.xml => video-virtio-gpu-ccw.s390x-latest.xml} (89%)

-- 
2.39.2