tests: Delete some redundant test cases

The default-models tests provide coverage for these scenarios
now.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.args
deleted file mode 100644 (file)
index 729d0ca..0000000
--- a/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
-/usr/bin/qemu-system-aarch64 \
--name guest=aarch64test,debug-threads=on \
--S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
--accel tcg \
--cpu cortex-a15 \
--m size=1048576k \
--object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
--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 \
--chardev socket,id=chrtpm,path=/dev/test \
--tpmdev emulator,id=tpm-tpm0,chardev=chrtpm \
--device '{"driver":"tpm-tis-device","tpmdev":"tpm-tpm0","id":"tpm0"}' \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on

diff --git a/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.xml
deleted file mode 100644 (file)
index e97f39a..0000000
--- a/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type='qemu'>
-  <name>aarch64test</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <gic version='2'/>
-  </features>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>cortex-a15</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-aarch64</emulator>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <tpm model='tpm-tis'>
-      <backend type='emulator' version='2.0'/>
-    </tpm>
-    <audio id='1' type='none'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxmlconfdata/aarch64-tpm.xml b/tests/qemuxmlconfdata/aarch64-tpm.xml
deleted file mode 100644 (file)
index b22dbee..0000000
--- a/tests/qemuxmlconfdata/aarch64-tpm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="qemu">
-  <name>aarch64test</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-  <memory>1048576</memory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch="aarch64" machine="virt">hvm</type>
-  </os>
-  <devices>
-    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <tpm>
-      <backend type='emulator'/>
-    </tpm>
-  </devices>
-</domain>

diff --git a/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.args
deleted file mode 100644 (file)
index cba1950..0000000
--- a/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.args
+++ /dev/null
@@ -1,45 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
-/usr/bin/qemu-system-ppc64 \
--name guest=TPM-VM,debug-threads=on \
--S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \
--machine pseries-5.0,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \
--accel tcg \
--cpu POWER9 \
--m size=2097152k \
--object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2147483648}' \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 11d7cd22-da89-3094-6212-079a48a309a1 \
--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 menu=on,strict=on \
--device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
--device '{"driver":"spapr-vscsi","id":"scsi0","reg":8192}' \
--device '{"driver":"spapr-vscsi","id":"scsi1","reg":12288}' \
--blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
--blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun":0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-1-format","id":"scsi1-0-0-0","bootindex":1}' \
--chardev pty,id=charserial0 \
--device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg":805306368}' \
--chardev pty,id=charserial1 \
--device '{"driver":"spapr-vty","chardev":"charserial1","id":"serial1","reg":805310464}' \
--chardev socket,id=chrtpm,path=/dev/test \
--tpmdev emulator,id=tpm-tpm0,chardev=chrtpm \
--device '{"driver":"tpm-spapr","tpmdev":"tpm-tpm0","id":"tpm0","reg":20480}' \
--audiodev '{"id":"audio1","driver":"none"}' \
--global spapr-nvram.reg=0x4000 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on

diff --git a/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.xml b/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.xml
deleted file mode 120000 (symlink)
index e3c4cd8..0000000
--- a/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-tpm-emulator-spapr.xml
\ No newline at end of file

diff --git a/tests/qemuxmlconfdata/tpm-emulator-spapr.xml b/tests/qemuxmlconfdata/tpm-emulator-spapr.xml
deleted file mode 100644 (file)
index 1b4b825..0000000
--- a/tests/qemuxmlconfdata/tpm-emulator-spapr.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<domain type='qemu'>
-  <name>TPM-VM</name>
-  <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid>
-  <memory unit='KiB'>2097152</memory>
-  <currentMemory unit='KiB'>512288</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='ppc64' machine='pseries-5.0'>hvm</type>
-    <boot dev='hd'/>
-    <bootmenu enable='yes'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <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='raw'/>
-      <source file='/tmp/scsidisk.img'/>
-      <target dev='sda' bus='scsi'/>
-      <address type='drive' controller='1' bus='0' target='0' unit='0'/>
-    </disk>
-    <controller type='scsi' index='0' model='ibmvscsi'>
-      <address type='spapr-vio' reg='0x00002000'/>
-    </controller>
-    <controller type='scsi' index='1' model='ibmvscsi'>
-      <address type='spapr-vio' reg='0x00003000'/>
-    </controller>
-    <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>
-    <serial type='pty'>
-      <target type='spapr-vio-serial' port='1'>
-        <model name='spapr-vty'/>
-      </target>
-      <address type='spapr-vio' reg='0x30001000'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-      <address type='spapr-vio' reg='0x30000000'/>
-    </console>
-    <tpm model='tpm-spapr'>
-      <backend type='emulator' version='2.0'/>
-      <address type='spapr-vio' reg='0x00005000'/>
-    </tpm>
-    <audio id='1' type='none'/>
-    <memballoon model='none'/>
-    <nvram>
-      <address type='spapr-vio' reg='0x00004000'/>
-    </nvram>
-    <panic model='pseries'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 2842b44b3e1dfdf7695b33071cbf58040b980297..d2f62081b70662643681d608d36649559d6ea7b7 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2482,8 +2482,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2");
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc");
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate");
-    DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr");
-    DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-tpm-wrong-model", "aarch64");
     DO_TEST_CAPS_LATEST("tpm-external");