From: Michal Privoznik <mprivozn@redhat.com> Both ppc64-default-cpu-kvm-pseries-2.7 and ppc64-default-cpu-tcg-pseries-2.7 test cases rely on pseries-2.7 machine type. It was removed in QEMU-7.2. Soon the minimal version is going to be bumped to QEMU-7.2 rendering those tests obsolete. Drop them. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- ...fault-cpu-kvm-pseries-2.7.ppc64-7.0.0.args | 38 -------------- ...efault-cpu-kvm-pseries-2.7.ppc64-7.0.0.xml | 49 ------------------- .../ppc64-default-cpu-kvm-pseries-2.7.xml | 22 --------- ...fault-cpu-tcg-pseries-2.7.ppc64-7.0.0.args | 38 -------------- ...efault-cpu-tcg-pseries-2.7.ppc64-7.0.0.xml | 49 ------------------- .../ppc64-default-cpu-tcg-pseries-2.7.xml | 22 --------- tests/qemuxmlconftest.c | 2 - 7 files changed, 220 deletions(-) delete mode 100644 tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.args delete mode 100644 tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.xml delete mode 100644 tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.xml delete mode 100644 tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.args delete mode 100644 tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.xml delete mode 100644 tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.xml diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.args deleted file mode 100644 index 1f20137d0e..0000000000 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-guest \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=guest,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pseries-2.7,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \ --accel kvm \ --cpu POWER9 \ --m size=4194304k \ --object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294967296}' \ --overcommit mem-lock=off \ --smp 4,sockets=4,cores=1,threads=1 \ --uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ --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 \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --chardev pty,id=charserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg":805306368}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.xml deleted file mode 100644 index ceaae0f6c8..0000000000 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-7.0.0.xml +++ /dev/null @@ -1,49 +0,0 @@ -<domain type='kvm'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory unit='KiB'>4194304</memory> - <currentMemory unit='KiB'>4194304</currentMemory> - <vcpu placement='static'>4</vcpu> - <os> - <type arch='ppc64' machine='pseries-2.7'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>POWER9</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-ppc64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </disk> - <controller type='usb' index='0' model='pci-ohci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pci-root'> - <model name='spapr-pci-host-bridge'/> - <target index='0'/> - </controller> - <serial type='pty'> - <target type='spapr-vio-serial' port='0'> - <model name='spapr-vty'/> - </target> - <address type='spapr-vio' reg='0x30000000'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - <address type='spapr-vio' reg='0x30000000'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - <panic model='pseries'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.xml deleted file mode 100644 index 9aac1815c4..0000000000 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.xml +++ /dev/null @@ -1,22 +0,0 @@ -<domain type='kvm'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory>4194304</memory> - <currentMemory>4194304</currentMemory> - <vcpu>4</vcpu> - <os> - <type arch='ppc64' machine='pseries-2.7'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <devices> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - </disk> - <console type='pty'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.args deleted file mode 100644 index a4d46e38bf..0000000000 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-guest \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=guest,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine pseries-2.7,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \ --accel tcg \ --cpu POWER7 \ --m size=4194304k \ --object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294967296}' \ --overcommit mem-lock=off \ --smp 4,sockets=4,cores=1,threads=1 \ --uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ --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 \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --chardev pty,id=charserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg":805306368}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.xml deleted file mode 100644 index f04ef099a3..0000000000 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-7.0.0.xml +++ /dev/null @@ -1,49 +0,0 @@ -<domain type='qemu'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory unit='KiB'>4194304</memory> - <currentMemory unit='KiB'>4194304</currentMemory> - <vcpu placement='static'>4</vcpu> - <os> - <type arch='ppc64' machine='pseries-2.7'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>POWER7</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-ppc64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </disk> - <controller type='usb' index='0' model='pci-ohci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pci-root'> - <model name='spapr-pci-host-bridge'/> - <target index='0'/> - </controller> - <serial type='pty'> - <target type='spapr-vio-serial' port='0'> - <model name='spapr-vty'/> - </target> - <address type='spapr-vio' reg='0x30000000'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - <address type='spapr-vio' reg='0x30000000'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - <panic model='pseries'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.xml deleted file mode 100644 index 3e873becc6..0000000000 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.xml +++ /dev/null @@ -1,22 +0,0 @@ -<domain type='qemu'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory>4194304</memory> - <currentMemory>4194304</currentMemory> - <vcpu>4</vcpu> - <os> - <type arch='ppc64' machine='pseries-2.7'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <devices> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - </disk> - <console type='pty'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 6d0f6d2aee..958e9bd68c 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2963,8 +2963,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-10.0", "aarch64"); DO_TEST_CAPS_ARCH_VER("aarch64-default-cpu-tcg-virt-4.2", "aarch64", "10.0.0"); DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-tcg-virt-10.0", "aarch64"); - DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-kvm-pseries-2.7", "ppc64", "7.0.0"); - DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-tcg-pseries-2.7", "ppc64", "7.0.0"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-3.1", "ppc64"); 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"); -- 2.53.0