qemuxml2argvtest: Drop negative test cases for 'pseries' machine features

All of the tested features are always present in the 'pseries' machine
with oldest-supported qemu-4.2, thus the tests don't make sense any
more.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/pseries-features-ccf.err b/tests/qemuxml2argvdata/pseries-features-ccf.err
deleted file mode 100644 (file)
index 83e8825..0000000
--- a/tests/qemuxml2argvdata/pseries-features-ccf.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: ccf-assist configuration is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/pseries-features-ccf.xml b/tests/qemuxml2argvdata/pseries-features-ccf.xml
deleted file mode 100644 (file)
index 037d9fe..0000000
--- a/tests/qemuxml2argvdata/pseries-features-ccf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<domain type='qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <features>
-    <ccf-assist state='on'/>
-  </features>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvdata/pseries-features-cfpc.err b/tests/qemuxml2argvdata/pseries-features-cfpc.err
deleted file mode 100644 (file)
index 47938f1..0000000
--- a/tests/qemuxml2argvdata/pseries-features-cfpc.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: cfpc configuration is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/pseries-features-cfpc.xml b/tests/qemuxml2argvdata/pseries-features-cfpc.xml
deleted file mode 100644 (file)
index 9229e87..0000000
--- a/tests/qemuxml2argvdata/pseries-features-cfpc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<domain type='qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <features>
-    <cfpc value='fixed'/>
-  </features>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.err b/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.err
deleted file mode 100644 (file)
index ea3ad28..0000000
--- a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: Configuring the page size for HPT guests is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml b/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml
deleted file mode 100644 (file)
index ba919f6..0000000
--- a/tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<domain type='qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <features>
-    <hpt resizing='required'>
-      <maxpagesize unit='GiB'>1</maxpagesize>
-    </hpt>
-  </features>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvdata/pseries-features-htm.err b/tests/qemuxml2argvdata/pseries-features-htm.err
deleted file mode 100644 (file)
index d0bbcb0..0000000
--- a/tests/qemuxml2argvdata/pseries-features-htm.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: HTM configuration is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/pseries-features-htm.xml b/tests/qemuxml2argvdata/pseries-features-htm.xml
deleted file mode 100644 (file)
index 59ac294..0000000
--- a/tests/qemuxml2argvdata/pseries-features-htm.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<domain type='qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <features>
-    <htm state='on'/>
-  </features>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvdata/pseries-features-ibs.err b/tests/qemuxml2argvdata/pseries-features-ibs.err
deleted file mode 100644 (file)
index 7b4d125..0000000
--- a/tests/qemuxml2argvdata/pseries-features-ibs.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: ibs configuration is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/pseries-features-ibs.xml b/tests/qemuxml2argvdata/pseries-features-ibs.xml
deleted file mode 100644 (file)
index c3317b4..0000000
--- a/tests/qemuxml2argvdata/pseries-features-ibs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<domain type='qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <features>
-    <ibs value='fixed-ccd'/>
-  </features>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvdata/pseries-features-nested-hv.err b/tests/qemuxml2argvdata/pseries-features-nested-hv.err
deleted file mode 100644 (file)
index cd6d8a6..0000000
--- a/tests/qemuxml2argvdata/pseries-features-nested-hv.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: Nested HV configuration is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/pseries-features-nested-hv.xml b/tests/qemuxml2argvdata/pseries-features-nested-hv.xml
deleted file mode 100644 (file)
index 8d74ab4..0000000
--- a/tests/qemuxml2argvdata/pseries-features-nested-hv.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<domain type='qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <features>
-    <nested-hv state='on'/>
-  </features>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvdata/pseries-features-sbbc.err b/tests/qemuxml2argvdata/pseries-features-sbbc.err
deleted file mode 100644 (file)
index b3c0017..0000000
--- a/tests/qemuxml2argvdata/pseries-features-sbbc.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: sbbc configuration is not supported by this QEMU binary

diff --git a/tests/qemuxml2argvdata/pseries-features-sbbc.xml b/tests/qemuxml2argvdata/pseries-features-sbbc.xml
deleted file mode 100644 (file)
index e7f8d46..0000000
--- a/tests/qemuxml2argvdata/pseries-features-sbbc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<domain type='qemu'>
-  <name>guest</name>
-  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
-  <memory unit='KiB'>524288</memory>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-  </os>
-  <features>
-    <sbbc value='workaround'/>
-  </features>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6560bcfaabe7bc8d88245fc5aa8f0f48bad81231..2ed3ae3cb7e0b090b8e2ee87c9c763899cd5dc1f 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2004,21 +2004,6 @@ mymain(void)
     DO_TEST_CAPS_ARCH_VER("pseries-features", "ppc64", "4.2.0");
     DO_TEST_CAPS_LATEST_PPC64("pseries-features");
 
-    /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-hpt-pagesize");
-    /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-htm");
-    /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV */
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-nested-hv");
-    /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST */
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-ccf");
-    /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CFPC */
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-cfpc");
-    /* parse error: no QEMU_CAPS_MACHINE_PSERIES_SBBC */
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-sbbc");
-    /* parse error: no QEMU_CAPS_MACHINE_PSERIES_IBS */
-    DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-ibs");
-
     DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-invalid-machine");
 
     DO_TEST_CAPS_LATEST_PPC64("pseries-serial-native");