[PATCH 06/14] cputest: Don't use unsupported preferred model

[Jiri Denemark <jdenemar@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
 tests/cputest.c                                           |  2 --
 tests/cputestdata/x86-host+guest,models,Penryn-result.xml | 13 -------------
 tests/cputestdata/x86-host+guest,models,qemu64-result.xml | 13 -------------
 3 files changed, 28 deletions(-)
 delete mode 100644 tests/cputestdata/x86-host+guest,models,Penryn-result.xml
 delete mode 100644 tests/cputestdata/x86-host+guest,models,qemu64-result.xml

diff --git a/tests/cputest.c b/tests/cputest.c
index 7f27521..16be61b 100644
--- 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
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
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>
-- 
2.10.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list