[libvirt PATCH 1/7] tests: Drop pseries-machine-max-cpu-compat

[Andrea Bolognani]

This was supposed to test the behavior when
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT is present, but these
days that's always the case and pseries-cpu-compat already
provides all the coverage we need.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 .../pseries-machine-max-cpu-compat.args       | 29 -------------------
 .../pseries-machine-max-cpu-compat.xml        | 17 -----------
 tests/qemuxml2argvtest.c                      |  4 ---
 3 files changed, 50 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
 delete mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml

diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
deleted file mode 100644
index d47dffd0e4..0000000000
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
+++ /dev/null
@@ -1,29 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-ppc64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pseries,usb=off,dump-guest-core=off,max-cpu-compat=power7 \
--accel kvm \
--cpu host \
--m 256 \
--overcommit mem-lock=off \
--smp 4,sockets=4,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
deleted file mode 100644
index ad2647370d..0000000000
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<domain type='kvm'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit='KiB'>219100</memory>
-  <vcpu placement='static'>4</vcpu>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <cpu mode='host-model'>
-    <model>power7</model>
-  </cpu>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-    <controller type='usb' model='none'/>
-    <memballoon model="none"/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ed41b7a7a2..e5379b45d6 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2194,10 +2194,6 @@ mymain(void)
     DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
-    DO_TEST("pseries-machine-max-cpu-compat",
-            QEMU_CAPS_KVM,
-            QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT,
-            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
     DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_DEVICE_SPAPR_VTY);
-- 
2.35.1