Guest CPUs with match='minimum' should always be updated to match host
CPU model. Trying to get different results by supplying preferred models
does not make sense.
Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
tests/cputest.c | 2 --
.../x86-host-better+pentium3,core2duo-result.xml | 21 ---------------
.../x86-host-better+pentium3,pentium3-result.xml | 30 ----------------------
3 files changed, 53 deletions(-)
delete mode 100644 tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml
delete mode 100644 tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml
diff --git a/tests/cputest.c b/tests/cputest.c
index 0d7f3ec..7f27521 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -792,8 +792,6 @@ mymain(void)
/* computing guest data and decoding the data into a guest CPU XML */
DO_TEST_GUESTDATA("x86", "host", "guest", NULL, NULL, 0);
DO_TEST_GUESTDATA("x86", "host-better", "pentium3", NULL, NULL, 0);
- DO_TEST_GUESTDATA("x86", "host-better", "pentium3", NULL, "pentium3", 0);
- DO_TEST_GUESTDATA("x86", "host-better", "pentium3", NULL, "core2duo", 0);
DO_TEST_GUESTDATA("x86", "host-worse", "guest", NULL, NULL, 0);
DO_TEST_GUESTDATA("x86", "host", "strict-force-extra", NULL, NULL, 0);
DO_TEST_GUESTDATA("x86", "host", "penryn-force", NULL, NULL, 0);
diff --git a/tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml b/tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml
deleted file mode 100644
index 2bf691c..0000000
--- a/tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
- <model fallback='allow'>core2duo</model>
- <feature policy='require' name='ds'/>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='ht'/>
- <feature policy='require' name='tm'/>
- <feature policy='require' name='pbe'/>
- <feature policy='require' name='ds_cpl'/>
- <feature policy='require' name='vmx'/>
- <feature policy='require' name='est'/>
- <feature policy='require' name='tm2'/>
- <feature policy='require' name='cx16'/>
- <feature policy='require' name='xtpr'/>
- <feature policy='require' name='dca'/>
- <feature policy='require' name='sse4.1'/>
- <feature policy='require' name='sse4.2'/>
- <feature policy='require' name='popcnt'/>
- <feature policy='require' name='lahf_lm'/>
-</cpu>
diff --git a/tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml b/tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml
deleted file mode 100644
index d1d0c4b..0000000
--- a/tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
- <model fallback='allow'>pentium3</model>
- <feature policy='require' name='apic'/>
- <feature policy='require' name='clflush'/>
- <feature policy='require' name='ds'/>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='sse2'/>
- <feature policy='require' name='ss'/>
- <feature policy='require' name='ht'/>
- <feature policy='require' name='tm'/>
- <feature policy='require' name='pbe'/>
- <feature policy='require' name='pni'/>
- <feature policy='require' name='monitor'/>
- <feature policy='require' name='ds_cpl'/>
- <feature policy='require' name='vmx'/>
- <feature policy='require' name='est'/>
- <feature policy='require' name='tm2'/>
- <feature policy='require' name='ssse3'/>
- <feature policy='require' name='cx16'/>
- <feature policy='require' name='xtpr'/>
- <feature policy='require' name='dca'/>
- <feature policy='require' name='sse4.1'/>
- <feature policy='require' name='sse4.2'/>
- <feature policy='require' name='popcnt'/>
- <feature policy='require' name='syscall'/>
- <feature policy='require' name='nx'/>
- <feature policy='require' name='lm'/>
- <feature policy='require' name='lahf_lm'/>
-</cpu>
--
2.10.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list