On 9/30/22 16:38, Ján Tomko wrote: > Now that we bumped the minimum QEMU version to 4.2.0, we can stop > probing some capabilities. > > Ján Tomko (6): > tests: qemuxml2argvdata: switch zpci address generation to real caps > qemu: convert some s390x tests to use real capability data > qemu: Assume QEMU_CAPS_CCW_CSSID_UNRESTRICTED > qemu: Assume QEMU_CAPS_CCW > qemu: retire QEMU_CAPS_CCW_CSSID_UNRESTRICTED > qemu: retire QEMU_CAPS_CCW > > src/qemu/qemu_capabilities.c | 21 +--- > src/qemu/qemu_capabilities.h | 4 +- > src/qemu/qemu_domain_address.c | 7 +- > src/qemu/qemu_hotplug.c | 6 +- > src/qemu/qemu_validate.c | 6 - > .../caps_4.2.0.s390x.replies | 71 ++++------- > .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 - > .../caps_5.2.0.s390x.replies | 76 ++++-------- > .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 - > .../caps_6.0.0.s390x.replies | 76 ++++-------- > .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 - > tests/qemuhotplugtest.c | 1 - > ... => balloon-ccw-deflate.s390x-latest.args} | 7 +- > ...s => console-virtio-ccw.s390x-latest.args} | 7 +- > ...ev-subsys-mdev-vfio-ccw.s390x-latest.args} | 7 +- > ...-zpci-autogenerate-fids.s390x-latest.args} | 10 +- > ...-zpci-autogenerate-uids.s390x-latest.args} | 10 +- > ...-vfio-zpci-autogenerate.s390x-latest.args} | 10 +- > .../hostdev-vfio-zpci-boundaries.args | 5 +- > ...fio-zpci-ccw-memballoon.s390x-latest.args} | 7 +- > ...ci-invalid-uid-valid-fid.s390x-latest.err} | 0 > ...o-zpci-multidomain-many.s390x-latest.args} | 10 +- > tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 3 +- > ...othreads-disk-virtio-ccw.s390x-4.2.0.args} | 8 +- > ....args => net-virtio-ccw.s390x-latest.args} | 7 +- > ...> non-x86_64-timer-error.s390x-latest.err} | 0 > ....args => virtio-rng-ccw.s390x-latest.args} | 9 +- > tests/qemuxml2argvtest.c | 112 ++++++------------ > .../hostdev-vfio-zpci-autogenerate-fids.xml | 4 +- > .../hostdev-vfio-zpci-autogenerate-uids.xml | 4 +- > .../hostdev-vfio-zpci-autogenerate.xml | 4 +- > .../hostdev-vfio-zpci-boundaries.xml | 4 +- > .../hostdev-vfio-zpci-multidomain-many.xml | 4 +- > tests/qemuxml2xmltest.c | 41 +++---- > 34 files changed, 199 insertions(+), 348 deletions(-) > rename tests/qemuxml2argvdata/{balloon-ccw-deflate.args => balloon-ccw-deflate.s390x-latest.args} (68%) > rename tests/qemuxml2argvdata/{console-virtio-ccw.args => console-virtio-ccw.s390x-latest.args} (77%) > rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw.args => hostdev-subsys-mdev-vfio-ccw.s390x-latest.args} (70%) > rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-autogenerate-fids.args => hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args} (69%) > rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-autogenerate-uids.args => hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args} (69%) > rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-autogenerate.args => hostdev-vfio-zpci-autogenerate.s390x-latest.args} (66%) > rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-ccw-memballoon.args => hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args} (54%) > rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-invalid-uid-valid-fid.err => hostdev-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err} (100%) > rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-multidomain-many.args => hostdev-vfio-zpci-multidomain-many.s390x-latest.args} (79%) > rename tests/qemuxml2argvdata/{iothreads-disk-virtio-ccw.args => iothreads-disk-virtio-ccw.s390x-4.2.0.args} (79%) > rename tests/qemuxml2argvdata/{net-virtio-ccw.args => net-virtio-ccw.s390x-latest.args} (73%) > rename tests/qemuxml2argvdata/{non-x86_64-timer-error.err => non-x86_64-timer-error.s390x-latest.err} (100%) > rename tests/qemuxml2argvdata/{virtio-rng-ccw.args => virtio-rng-ccw.s390x-latest.args} (74%) > Reviewed-by: Michal Privoznik <mprivozn@xxxxxxxxxx> Michal