cputest: Don't use unsupported preferred model

Using a preferred CPU model which is not in the list of CPU models
supported by a hypervisor does not make sense.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/cputest.c b/tests/cputest.c
index 7f27521a6eee9797aee9ac4b63c5dd8eacc2ba2d..16be61b59698a87591cf8a10ca22309f70d512ea 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -797,8 +797,6 @@ mymain(void)
     DO_TEST_GUESTDATA("x86", "host", "penryn-force", NULL, NULL, 0);
     DO_TEST_GUESTDATA("x86", "host", "guest", model486, NULL, 0);
     DO_TEST_GUESTDATA("x86", "host", "guest", models, NULL, 0);
-    DO_TEST_GUESTDATA("x86", "host", "guest", models, "Penryn", 0);
-    DO_TEST_GUESTDATA("x86", "host", "guest", models, "qemu64", 0);
     DO_TEST_GUESTDATA("x86", "host", "guest", nomodel, NULL, -1);
     DO_TEST_GUESTDATA("x86", "host", "guest-nofallback", models, "Penryn", -1);
     DO_TEST_GUESTDATA("x86", "host", "host+host-model", models, "Penryn", 0);

diff --git a/tests/cputestdata/x86-host+guest,models,Penryn-result.xml b/tests/cputestdata/x86-host+guest,models,Penryn-result.xml
deleted file mode 100644 (file)
index 6cd0668..0000000
--- a/tests/cputestdata/x86-host+guest,models,Penryn-result.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='allow'>Nehalem</model>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='svm'/>
-  <feature policy='disable' name='sse'/>
-  <feature policy='disable' name='sse4.2'/>
-  <feature policy='disable' name='popcnt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+guest,models,qemu64-result.xml b/tests/cputestdata/x86-host+guest,models,qemu64-result.xml
deleted file mode 100644 (file)
index 8b170e5..0000000
--- a/tests/cputestdata/x86-host+guest,models,qemu64-result.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='allow'>qemu64</model>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='sse4.1'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='disable' name='sse'/>
-</cpu>