In its upstream commit [1], qemu dropped s390-2.7 machine type, then in commit [2] the s390-2.8 machine type was dropped. But as Thomas Huth pointed out, any machine type that's older than 6 years is subject to removal [3]. This means, any machine type older than 4.1 is going to be removed eventually. We have two test cases that assumes existence of 2.7 machine type. While they could be switched to 4.1 machine type, we also have another test case that already check 4.2 machine type. Therefore, just drop the 2.7 ones. 1: https://gitlab.com/qemu-project/qemu/-/commit/3199c7ee76089fb6844f6b2bed1f5d3d99a7527c 2: https://gitlab.com/qemu-project/qemu/-/commit/66924fe36977d9d9e45ba3e0b6e851ee170507f6 3: https://gitlab.com/qemu-project/qemu/-/commit/ce80c4fa6ff0f5c379bba7db74d04593e9fb12f2 Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 32 ------------------- ...lt-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml | 25 --------------- .../s390-default-cpu-kvm-ccw-virtio-2.7.xml | 16 ---------- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 32 ------------------- ...lt-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml | 27 ---------------- .../s390-default-cpu-tcg-ccw-virtio-2.7.xml | 16 ---------- tests/qemuxmlconftest.c | 2 -- 7 files changed, 150 deletions(-) delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml 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.7.s390x-latest.args deleted file mode 100644 index 0d44697425..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -/usr/bin/qemu-system-s390x \ --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 \ --accel kvm \ --cpu host \ --m size=262144k \ --object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on 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.7.s390x-latest.xml deleted file mode 100644 index ae39e6277d..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml +++ /dev/null @@ -1,25 +0,0 @@ -<domain type='kvm'> - <name>test</name> - <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> - <memory unit='KiB'>262144</memory> - <currentMemory unit='KiB'>262144</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='host-passthrough' check='none'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <controller type='pci' index='0' model='pci-root'/> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> - </memballoon> - <panic model='s390'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml deleted file mode 100644 index a3c1804f57..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml +++ /dev/null @@ -1,16 +0,0 @@ -<domain type='kvm'> - <name>test</name> - <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> - <memory>262144</memory> - <currentMemory>262144</currentMemory> - <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - </devices> -</domain> 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.7.s390x-latest.args deleted file mode 100644 index 06b3f5733e..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -/usr/bin/qemu-system-s390x \ --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 \ --accel tcg \ --cpu qemu \ --m size=262144k \ --object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on 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.7.s390x-latest.xml deleted file mode 100644 index f4f9e724a9..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml +++ /dev/null @@ -1,27 +0,0 @@ -<domain type='qemu'> - <name>test</name> - <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> - <memory unit='KiB'>262144</memory> - <currentMemory unit='KiB'>262144</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>qemu</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <controller type='pci' index='0' model='pci-root'/> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> - </memballoon> - <panic model='s390'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml deleted file mode 100644 index 3451e9d81f..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml +++ /dev/null @@ -1,16 +0,0 @@ -<domain type='qemu'> - <name>test</name> - <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid> - <memory>262144</memory> - <currentMemory>262144</currentMemory> - <os> - <type arch='s390x' machine='s390-ccw-virtio-2.7'>hvm</type> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - </devices> -</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 6a46bfc7a3..5c95a49116 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2922,8 +2922,6 @@ 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-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
