In its upstream commit [1], qemu dropped s390-2.7 machine type, then in commit [2] the s390-2.8 machine type was dropped. Therefore, switch both tests to s390-2.9 which is still available (though deprecated). 1: https://gitlab.com/qemu-project/qemu/-/commit/3199c7ee76089fb6844f6b2bed1f5d3d99a7527c 2: https://gitlab.com/qemu-project/qemu/-/commit/66924fe36977d9d9e45ba3e0b6e851ee170507f6 Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- ... => s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.args} | 4 ++-- ...l => s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.xml} | 4 ++-- ...virtio-2.7.xml => s390-default-cpu-kvm-ccw-virtio-2.9.xml} | 2 +- ... => s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.args} | 2 +- ...l => s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.xml} | 2 +- ...virtio-2.7.xml => s390-default-cpu-tcg-ccw-virtio-2.9.xml} | 2 +- tests/qemuxmlconftest.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args => s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.args} (67%) rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml => s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.xml} (86%) rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-2.7.xml => s390-default-cpu-kvm-ccw-virtio-2.9.xml} (85%) rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args => s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.args} (94%) rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml => s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.xml} (92%) rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-2.7.xml => s390-default-cpu-tcg-ccw-virtio-2.9.xml} (85%) diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.args similarity index 67% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.args index 0d44697425..c5fe3fa95f 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.args @@ -10,9 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -name guest=test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-machine s390-ccw-virtio-2.9,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu host \ +-cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,appv=on,apqi=on,apft=on,els=on,iep=on,appvi=on,apqci=on,cte=on,ais=on,bpb=on,ctop=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ -m size=262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.xml similarity index 86% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.xml index ae39e6277d..b21a01b568 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.xml @@ -5,10 +5,10 @@ <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio-2.9'>hvm</type> <boot dev='hd'/> </os> - <cpu mode='host-passthrough' check='none'/> + <cpu mode='host-model' check='partial'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.xml similarity index 85% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.xml index a3c1804f57..b6cf53d1be 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.xml @@ -4,7 +4,7 @@ <memory>262144</memory> <currentMemory>262144</currentMemory> <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio-2.9'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.args similarity index 94% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.args index 06b3f5733e..a3ff26fe79 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -name guest=test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-machine s390-ccw-virtio-2.9,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel tcg \ -cpu qemu \ -m size=262144k \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.xml similarity index 92% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.xml index f4f9e724a9..2d26916fe5 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio-2.9'>hvm</type> <boot dev='hd'/> </os> <cpu mode='custom' match='exact' check='none'> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.xml similarity index 85% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.xml index 3451e9d81f..4f7b6ece9b 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.xml @@ -4,7 +4,7 @@ <memory>262144</memory> <currentMemory>262144</currentMemory> <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio-2.9'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 6a46bfc7a3..12a601b31b 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2922,8 +2922,8 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-3.1", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-4.2", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-4.2", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-2.7", "s390x"); - DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-2.7", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-2.9", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-2.9", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x"); DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc-4.2", "x86_64"); -- 2.45.2
