cputest: Rename x86 data files

While "x86" is a CPU sub driver name, it is not a recognized name of any
architecture known to libvirt. Let's use "x86_64" prefix which can be
used with virArch APIs.

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

diff --git a/tests/cputest.c b/tests/cputest.c
index 8d761af614e4bb846612eb45797da4217cb264a0..406b40dfe2bdecbbe75d683690ee2720457d5078 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -677,13 +677,13 @@ mymain(void)
     } while (0)
 
     /* host to host comparison */
-    DO_TEST_COMPARE("x86", "host", "host", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "host-better", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "host-worse", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "host-amd-fake", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "host-incomp-arch", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "host-no-vendor", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host-no-vendor", "host", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "host-better", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host-worse", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "host-amd-fake", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host-incomp-arch", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host-no-vendor", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host-no-vendor", "host", VIR_CPU_COMPARE_INCOMPATIBLE);
 
     DO_TEST_COMPARE("ppc64", "host", "host", VIR_CPU_COMPARE_IDENTICAL);
     DO_TEST_COMPARE("ppc64", "host", "host-better", VIR_CPU_COMPARE_INCOMPATIBLE);
@@ -693,28 +693,28 @@ mymain(void)
     DO_TEST_COMPARE("ppc64", "host-no-vendor", "host", VIR_CPU_COMPARE_INCOMPATIBLE);
 
     /* guest to host comparison */
-    DO_TEST_COMPARE("x86", "host", "bogus-model", VIR_CPU_COMPARE_ERROR);
-    DO_TEST_COMPARE("x86", "host", "bogus-feature", VIR_CPU_COMPARE_ERROR);
-    DO_TEST_COMPARE("x86", "host", "min", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "pentium3", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-forbid", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "exact-forbid-extra", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-disable", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-disable2", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-disable-extra", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-require", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-require-extra", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "exact-force", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "strict", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "strict-full", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "strict-disable", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "strict-force-extra", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "pentium3-amd", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host-amd", "pentium3-amd", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host-worse", "penryn-force", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "bogus-model", VIR_CPU_COMPARE_ERROR);
+    DO_TEST_COMPARE("x86_64", "host", "bogus-feature", VIR_CPU_COMPARE_ERROR);
+    DO_TEST_COMPARE("x86_64", "host", "min", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "pentium3", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-forbid", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "exact-forbid-extra", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-disable", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-disable2", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-disable-extra", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-require", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-require-extra", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "exact-force", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "strict", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "strict-full", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "strict-disable", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "strict-force-extra", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "pentium3-amd", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host-amd", "pentium3-amd", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host-worse", "penryn-force", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
 
     DO_TEST_COMPARE("ppc64", "host", "guest-strict", VIR_CPU_COMPARE_IDENTICAL);
     DO_TEST_COMPARE("ppc64", "host", "guest-exact", VIR_CPU_COMPARE_INCOMPATIBLE);
@@ -728,14 +728,14 @@ mymain(void)
 
     /* guest updates for migration
      * automatically compares host CPU with the result */
-    DO_TEST_UPDATE("x86", "host", "min", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host", "pentium3", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_UPDATE("x86", "host", "host-model", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host", "host-model-nofallback", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host-invtsc", "host-model", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_UPDATE_ONLY("x86", "host", "host-passthrough");
-    DO_TEST_UPDATE_ONLY("x86", "host", "host-passthrough-features");
+    DO_TEST_UPDATE("x86_64", "host", "min", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host", "pentium3", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_UPDATE("x86_64", "host", "host-model", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host", "host-model-nofallback", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host-invtsc", "host-model", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_UPDATE_ONLY("x86_64", "host", "host-passthrough");
+    DO_TEST_UPDATE_ONLY("x86_64", "host", "host-passthrough-features");
 
     DO_TEST_UPDATE("ppc64", "host", "guest", VIR_CPU_COMPARE_IDENTICAL);
     DO_TEST_UPDATE("ppc64", "host", "guest-nofallback", VIR_CPU_COMPARE_INCOMPATIBLE);
@@ -748,21 +748,21 @@ mymain(void)
     DO_TEST_UPDATE("ppc64", "host", "guest-compat-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
 
     /* computing baseline CPUs */
-    DO_TEST_BASELINE("x86", "incompatible-vendors", 0, -1);
-    DO_TEST_BASELINE("x86", "no-vendor", 0, 0);
-    DO_TEST_BASELINE("x86", "some-vendors", 0, 0);
-    DO_TEST_BASELINE("x86", "1", 0, 0);
-    DO_TEST_BASELINE("x86", "2", 0, 0);
-    DO_TEST_BASELINE("x86", "3", 0, 0);
-    DO_TEST_BASELINE("x86", "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE("x86", "4", 0, 0);
-    DO_TEST_BASELINE("x86", "4", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE("x86", "5", 0, 0);
-    DO_TEST_BASELINE("x86", "5", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE("x86", "6", 0, 0);
-    DO_TEST_BASELINE("x86", "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0);
-    DO_TEST_BASELINE("x86", "7", 0, 0);
-    DO_TEST_BASELINE("x86", "8", 0, 0);
+    DO_TEST_BASELINE("x86_64", "incompatible-vendors", 0, -1);
+    DO_TEST_BASELINE("x86_64", "no-vendor", 0, 0);
+    DO_TEST_BASELINE("x86_64", "some-vendors", 0, 0);
+    DO_TEST_BASELINE("x86_64", "1", 0, 0);
+    DO_TEST_BASELINE("x86_64", "2", 0, 0);
+    DO_TEST_BASELINE("x86_64", "3", 0, 0);
+    DO_TEST_BASELINE("x86_64", "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE("x86_64", "4", 0, 0);
+    DO_TEST_BASELINE("x86_64", "4", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE("x86_64", "5", 0, 0);
+    DO_TEST_BASELINE("x86_64", "5", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE("x86_64", "6", 0, 0);
+    DO_TEST_BASELINE("x86_64", "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0);
+    DO_TEST_BASELINE("x86_64", "7", 0, 0);
+    DO_TEST_BASELINE("x86_64", "8", 0, 0);
 
     DO_TEST_BASELINE("ppc64", "incompatible-vendors", 0, -1);
     DO_TEST_BASELINE("ppc64", "no-vendor", 0, 0);
@@ -771,29 +771,29 @@ mymain(void)
     DO_TEST_BASELINE("ppc64", "legacy", 0, -1);
 
     /* CPU features */
-    DO_TEST_HASFEATURE("x86", "host", "vmx", YES);
-    DO_TEST_HASFEATURE("x86", "host", "lm", YES);
-    DO_TEST_HASFEATURE("x86", "host", "sse4.1", YES);
-    DO_TEST_HASFEATURE("x86", "host", "3dnowext", NO);
-    DO_TEST_HASFEATURE("x86", "host", "skinit", NO);
-    DO_TEST_HASFEATURE("x86", "host", "foo", FAIL);
+    DO_TEST_HASFEATURE("x86_64", "host", "vmx", YES);
+    DO_TEST_HASFEATURE("x86_64", "host", "lm", YES);
+    DO_TEST_HASFEATURE("x86_64", "host", "sse4.1", YES);
+    DO_TEST_HASFEATURE("x86_64", "host", "3dnowext", NO);
+    DO_TEST_HASFEATURE("x86_64", "host", "skinit", NO);
+    DO_TEST_HASFEATURE("x86_64", "host", "foo", FAIL);
 
     /* computing guest data and decoding the data into a guest CPU XML */
-    DO_TEST_GUESTCPU("x86", "host", "guest", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host-better", "pentium3", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host-worse", "guest", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host", "strict-force-extra", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host", "penryn-force", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host", "guest", model486, 0);
-    DO_TEST_GUESTCPU("x86", "host", "guest", models, 0);
-    DO_TEST_GUESTCPU("x86", "host", "guest", nomodel, -1);
-    DO_TEST_GUESTCPU("x86", "host", "guest-nofallback", models, -1);
-    DO_TEST_GUESTCPU("x86", "host", "host+host-model", models, 0);
-    DO_TEST_GUESTCPU("x86", "host", "host+host-model-nofallback", models, -1);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell", haswell, 0);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell-noTSX", haswell, 0);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell-noTSX-nofallback", haswell, -1);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell-noTSX", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-better", "pentium3", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-worse", "guest", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "strict-force-extra", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "penryn-force", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", model486, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", models, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", nomodel, -1);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest-nofallback", models, -1);
+    DO_TEST_GUESTCPU("x86_64", "host", "host+host-model", models, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "host+host-model-nofallback", models, -1);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell", haswell, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell-noTSX", haswell, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell-noTSX-nofallback", haswell, -1);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell-noTSX", NULL, 0);
 
     DO_TEST_GUESTCPU("ppc64", "host", "guest", ppc_models, 0);
     DO_TEST_GUESTCPU("ppc64", "host", "guest-nofallback", ppc_models, -1);
@@ -801,35 +801,35 @@ mymain(void)
     DO_TEST_GUESTCPU("ppc64", "host", "guest-legacy-incompatible", ppc_models, -1);
     DO_TEST_GUESTCPU("ppc64", "host", "guest-legacy-invalid", ppc_models, -1);
 
-    DO_TEST_CPUID("x86", "A10-5800K", true);
-    DO_TEST_CPUID("x86", "Atom-D510", false);
-    DO_TEST_CPUID("x86", "Atom-N450", false);
-    DO_TEST_CPUID("x86", "Core-i5-2500", true);
-    DO_TEST_CPUID("x86", "Core-i5-2540M", true);
-    DO_TEST_CPUID("x86", "Core-i5-4670T", true);
-    DO_TEST_CPUID("x86", "Core-i5-6600", true);
-    DO_TEST_CPUID("x86", "Core-i7-2600", true);
-    DO_TEST_CPUID("x86", "Core-i7-3520M", false);
-    DO_TEST_CPUID("x86", "Core-i7-3740QM", true);
-    DO_TEST_CPUID("x86", "Core-i7-3770", true);
-    DO_TEST_CPUID("x86", "Core-i7-4600U", true);
-    DO_TEST_CPUID("x86", "Core-i7-5600U", true);
-    DO_TEST_CPUID("x86", "Core2-E6850", true);
-    DO_TEST_CPUID("x86", "Core2-Q9500", false);
-    DO_TEST_CPUID("x86", "FX-8150", false);
-    DO_TEST_CPUID("x86", "Opteron-1352", false);
-    DO_TEST_CPUID("x86", "Opteron-2350", true);
-    DO_TEST_CPUID("x86", "Opteron-6234", true);
-    DO_TEST_CPUID("x86", "Opteron-6282", false);
-    DO_TEST_CPUID("x86", "Pentium-P6100", false);
-    DO_TEST_CPUID("x86", "Phenom-B95", true);
-    DO_TEST_CPUID("x86", "Xeon-5110", false);
-    DO_TEST_CPUID("x86", "Xeon-E3-1245", true);
-    DO_TEST_CPUID("x86", "Xeon-E5-2630", true);
-    DO_TEST_CPUID("x86", "Xeon-E5-2650", true);
-    DO_TEST_CPUID("x86", "Xeon-E7-4820", true);
-    DO_TEST_CPUID("x86", "Xeon-W3520", true);
-    DO_TEST_CPUID("x86", "Xeon-X5460", false);
+    DO_TEST_CPUID("x86_64", "A10-5800K", true);
+    DO_TEST_CPUID("x86_64", "Atom-D510", false);
+    DO_TEST_CPUID("x86_64", "Atom-N450", false);
+    DO_TEST_CPUID("x86_64", "Core-i5-2500", true);
+    DO_TEST_CPUID("x86_64", "Core-i5-2540M", true);
+    DO_TEST_CPUID("x86_64", "Core-i5-4670T", true);
+    DO_TEST_CPUID("x86_64", "Core-i5-6600", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-2600", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-3520M", false);
+    DO_TEST_CPUID("x86_64", "Core-i7-3740QM", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-3770", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-4600U", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-5600U", true);
+    DO_TEST_CPUID("x86_64", "Core2-E6850", true);
+    DO_TEST_CPUID("x86_64", "Core2-Q9500", false);
+    DO_TEST_CPUID("x86_64", "FX-8150", false);
+    DO_TEST_CPUID("x86_64", "Opteron-1352", false);
+    DO_TEST_CPUID("x86_64", "Opteron-2350", true);
+    DO_TEST_CPUID("x86_64", "Opteron-6234", true);
+    DO_TEST_CPUID("x86_64", "Opteron-6282", false);
+    DO_TEST_CPUID("x86_64", "Pentium-P6100", false);
+    DO_TEST_CPUID("x86_64", "Phenom-B95", true);
+    DO_TEST_CPUID("x86_64", "Xeon-5110", false);
+    DO_TEST_CPUID("x86_64", "Xeon-E3-1245", true);
+    DO_TEST_CPUID("x86_64", "Xeon-E5-2630", true);
+    DO_TEST_CPUID("x86_64", "Xeon-E5-2650", true);
+    DO_TEST_CPUID("x86_64", "Xeon-E7-4820", true);
+    DO_TEST_CPUID("x86_64", "Xeon-W3520", true);
+    DO_TEST_CPUID("x86_64", "Xeon-X5460", false);
 
 #if WITH_QEMU && WITH_YAJL
     qemuTestDriverFree(&driver);

diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh
index c3b5ef106665f46ad2a3cc3f4326ed1df1aada5b..3db401daaa079c08531a4fce9ba1ba938f37487e 100755 (executable)
--- a/tests/cputestdata/cpu-parse.sh
+++ b/tests/cputestdata/cpu-parse.sh
@@ -18,7 +18,7 @@ fname=`sed -e 's/^ *//;
                s/ APU .*//;
                s/ \(v[0-9]\|SE\)$//;
                s/ /-/g' <<<"$model"`
-fname="x86-cpuid-$fname"
+fname="x86_64-cpuid-$fname"
 
 xml()
 {

diff --git a/tests/cputestdata/x86-Haswell-noTSX-nofallback.xml b/tests/cputestdata/x86-Haswell-noTSX-nofallback.xml
deleted file mode 100644 (file)
index c23c3f3..0000000
--- a/tests/cputestdata/x86-Haswell-noTSX-nofallback.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Haswell-noTSX</model>
-  <topology sockets='1' cores='2' threads='2'/>
-</cpu>

diff --git a/tests/cputestdata/x86-Haswell-noTSX.xml b/tests/cputestdata/x86-Haswell-noTSX.xml
deleted file mode 100644 (file)
index 3b74089..0000000
--- a/tests/cputestdata/x86-Haswell-noTSX.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Haswell-noTSX</model>
-  <topology sockets='1' cores='2' threads='2'/>
-</cpu>

diff --git a/tests/cputestdata/x86-Haswell.xml b/tests/cputestdata/x86-Haswell.xml
deleted file mode 100644 (file)
index 630cb99..0000000
--- a/tests/cputestdata/x86-Haswell.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cpu match='exact'>
-  <model fallback='allow'>Haswell</model>
-  <topology sockets='1' cores='2' threads='2'/>
-  <feature name='rtm' policy='disable'/>
-  <feature name='hle' policy='disable'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-1-result.xml b/tests/cputestdata/x86-baseline-1-result.xml
deleted file mode 100644 (file)
index 96c4f43..0000000
--- a/tests/cputestdata/x86-baseline-1-result.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Conroe</model>
-  <vendor>Intel</vendor>
-  <feature policy='disable' name='lahf_lm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-1.xml b/tests/cputestdata/x86-baseline-1.xml
deleted file mode 100644 (file)
index 509e6a8..0000000
--- a/tests/cputestdata/x86-baseline-1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <vendor>Intel</vendor>
-  <topology sockets='2' cores='4' threads='1'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Conroe</model>
-  <vendor>Intel</vendor>
-  <topology sockets='1' cores='1' threads='1'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>core2duo</model>
-  <vendor>Intel</vendor>
-  <topology sockets='1' cores='1' threads='1'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-2-result.xml b/tests/cputestdata/x86-baseline-2-result.xml
deleted file mode 100644 (file)
index a11352d..0000000
--- a/tests/cputestdata/x86-baseline-2-result.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>core2duo</model>
-  <feature policy='disable' name='nx'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-2.xml b/tests/cputestdata/x86-baseline-2.xml
deleted file mode 100644 (file)
index 055223f..0000000
--- a/tests/cputestdata/x86-baseline-2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>core2duo</model>
-  <topology sockets='1' cores='2' threads='1'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>pentiumpro</model>
-  <topology sockets='1' cores='2' threads='1'/>
-  <feature name='mtrr'/>
-  <feature name='clflush'/>
-  <feature name='mca'/>
-  <feature name='vme'/>
-  <feature name='pse36'/>
-  <feature name='pni'/>
-  <feature name='monitor'/>
-  <feature name='ssse3'/>
-  <feature name='lm'/>
-  <feature name='syscall'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-3-expanded.xml b/tests/cputestdata/x86-baseline-3-expanded.xml
deleted file mode 100644 (file)
index f0c2273..0000000
--- a/tests/cputestdata/x86-baseline-3-expanded.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-  <feature policy='require' name='fpu'/>
-  <feature policy='require' name='de'/>
-  <feature policy='require' name='pse'/>
-  <feature policy='require' name='tsc'/>
-  <feature policy='require' name='msr'/>
-  <feature policy='require' name='pae'/>
-  <feature policy='require' name='mce'/>
-  <feature policy='require' name='cx8'/>
-  <feature policy='require' name='apic'/>
-  <feature policy='require' name='sep'/>
-  <feature policy='require' name='mtrr'/>
-  <feature policy='require' name='pge'/>
-  <feature policy='require' name='mca'/>
-  <feature policy='require' name='cmov'/>
-  <feature policy='require' name='pat'/>
-  <feature policy='require' name='pse36'/>
-  <feature policy='require' name='clflush'/>
-  <feature policy='require' name='mmx'/>
-  <feature policy='require' name='fxsr'/>
-  <feature policy='require' name='sse'/>
-  <feature policy='require' name='sse2'/>
-  <feature policy='require' name='pni'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='sse4.1'/>
-  <feature policy='require' name='sse4.2'/>
-  <feature policy='require' name='popcnt'/>
-  <feature policy='require' name='aes'/>
-  <feature policy='require' name='syscall'/>
-  <feature policy='require' name='nx'/>
-  <feature policy='require' name='lm'/>
-  <feature policy='require' name='lahf_lm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-3-result.xml b/tests/cputestdata/x86-baseline-3-result.xml
deleted file mode 100644 (file)
index 7349831..0000000
--- a/tests/cputestdata/x86-baseline-3-result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-3.xml b/tests/cputestdata/x86-baseline-3.xml
deleted file mode 100644 (file)
index 7654a1d..0000000
--- a/tests/cputestdata/x86-baseline-3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <topology sockets='1' cores='2' threads='1'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-4-expanded.xml b/tests/cputestdata/x86-baseline-4-expanded.xml
deleted file mode 100644 (file)
index 7e4578e..0000000
--- a/tests/cputestdata/x86-baseline-4-expanded.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pclmuldq'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='xsave'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='avx'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='fpu'/>
-  <feature policy='require' name='de'/>
-  <feature policy='require' name='pse'/>
-  <feature policy='require' name='tsc'/>
-  <feature policy='require' name='msr'/>
-  <feature policy='require' name='pae'/>
-  <feature policy='require' name='mce'/>
-  <feature policy='require' name='cx8'/>
-  <feature policy='require' name='apic'/>
-  <feature policy='require' name='sep'/>
-  <feature policy='require' name='mtrr'/>
-  <feature policy='require' name='pge'/>
-  <feature policy='require' name='mca'/>
-  <feature policy='require' name='cmov'/>
-  <feature policy='require' name='pat'/>
-  <feature policy='require' name='pse36'/>
-  <feature policy='require' name='clflush'/>
-  <feature policy='require' name='mmx'/>
-  <feature policy='require' name='fxsr'/>
-  <feature policy='require' name='sse'/>
-  <feature policy='require' name='sse2'/>
-  <feature policy='require' name='pni'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='sse4.1'/>
-  <feature policy='require' name='sse4.2'/>
-  <feature policy='require' name='popcnt'/>
-  <feature policy='require' name='aes'/>
-  <feature policy='require' name='syscall'/>
-  <feature policy='require' name='nx'/>
-  <feature policy='require' name='lm'/>
-  <feature policy='require' name='lahf_lm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-4-result.xml b/tests/cputestdata/x86-baseline-4-result.xml
deleted file mode 100644 (file)
index 1461a5b..0000000
--- a/tests/cputestdata/x86-baseline-4-result.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Westmere</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pclmuldq'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='xsave'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='avx'/>
-  <feature policy='require' name='hypervisor'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-4.xml b/tests/cputestdata/x86-baseline-4.xml
deleted file mode 100644 (file)
index 7f5ae16..0000000
--- a/tests/cputestdata/x86-baseline-4.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-5-expanded.xml b/tests/cputestdata/x86-baseline-5-expanded.xml
deleted file mode 100644 (file)
index daef2a7..0000000
--- a/tests/cputestdata/x86-baseline-5-expanded.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='disable' name='rdtscp'/>
-  <feature policy='require' name='fpu'/>
-  <feature policy='require' name='de'/>
-  <feature policy='require' name='pse'/>
-  <feature policy='require' name='tsc'/>
-  <feature policy='require' name='msr'/>
-  <feature policy='require' name='pae'/>
-  <feature policy='require' name='mce'/>
-  <feature policy='require' name='cx8'/>
-  <feature policy='require' name='apic'/>
-  <feature policy='require' name='sep'/>
-  <feature policy='require' name='mtrr'/>
-  <feature policy='require' name='pge'/>
-  <feature policy='require' name='mca'/>
-  <feature policy='require' name='cmov'/>
-  <feature policy='require' name='pat'/>
-  <feature policy='require' name='pse36'/>
-  <feature policy='require' name='clflush'/>
-  <feature policy='require' name='mmx'/>
-  <feature policy='require' name='fxsr'/>
-  <feature policy='require' name='sse'/>
-  <feature policy='require' name='sse2'/>
-  <feature policy='require' name='pni'/>
-  <feature policy='require' name='pclmuldq'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='sse4.1'/>
-  <feature policy='require' name='sse4.2'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='popcnt'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='aes'/>
-  <feature policy='require' name='xsave'/>
-  <feature policy='require' name='avx'/>
-  <feature policy='require' name='syscall'/>
-  <feature policy='require' name='nx'/>
-  <feature policy='require' name='lm'/>
-  <feature policy='require' name='lahf_lm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-5-result.xml b/tests/cputestdata/x86-baseline-5-result.xml
deleted file mode 100644 (file)
index 775a27d..0000000
--- a/tests/cputestdata/x86-baseline-5-result.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='disable' name='rdtscp'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-5.xml b/tests/cputestdata/x86-baseline-5.xml
deleted file mode 100644 (file)
index 80cd533..0000000
--- a/tests/cputestdata/x86-baseline-5.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Nehalem</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='aes'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-6-migratable.xml b/tests/cputestdata/x86-baseline-6-migratable.xml
deleted file mode 100644 (file)
index 775a27d..0000000
--- a/tests/cputestdata/x86-baseline-6-migratable.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='disable' name='rdtscp'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-6-result.xml b/tests/cputestdata/x86-baseline-6-result.xml
deleted file mode 100644 (file)
index cafca97..0000000
--- a/tests/cputestdata/x86-baseline-6-result.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='invtsc'/>
-  <feature policy='disable' name='rdtscp'/>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-6.xml b/tests/cputestdata/x86-baseline-6.xml
deleted file mode 100644 (file)
index 9845b93..0000000
--- a/tests/cputestdata/x86-baseline-6.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-  <feature name='invtsc'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Nehalem</model>
-  <vendor>Intel</vendor>
-  <topology sockets='4' cores='1' threads='1'/>
-  <feature name='aes'/>
-  <feature name='hypervisor'/>
-  <feature name='avx'/>
-  <feature name='osxsave'/>
-  <feature name='xsave'/>
-  <feature name='tsc-deadline'/>
-  <feature name='x2apic'/>
-  <feature name='pcid'/>
-  <feature name='pclmuldq'/>
-  <feature name='ss'/>
-  <feature name='vme'/>
-  <feature name='invtsc'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-7-result.xml b/tests/cputestdata/x86-baseline-7-result.xml
deleted file mode 100644 (file)
index 2af549e..0000000
--- a/tests/cputestdata/x86-baseline-7-result.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-7.xml b/tests/cputestdata/x86-baseline-7.xml
deleted file mode 100644 (file)
index b7e61b1..0000000
--- a/tests/cputestdata/x86-baseline-7.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpuTest>
-    <cpu>
-      <arch>x86_64</arch>
-      <model>SandyBridge</model>
-      <vendor>Intel</vendor>
-      <topology sockets='1' cores='2' threads='2'/>
-      <feature name='invpcid'/>
-      <feature name='erms'/>
-      <feature name='bmi2'/>
-      <feature name='smep'/>
-      <feature name='avx2'/>
-      <feature name='bmi1'/>
-      <feature name='fsgsbase'/>
-      <feature name='movbe'/>
-      <feature name='pcid'/>
-      <feature name='fma'/>
-    </cpu>
-    <cpu>
-      <arch>x86_64</arch>
-      <model>Haswell-noTSX</model>
-      <vendor>Intel</vendor>
-      <topology sockets='1' cores='2' threads='2'/>
-    </cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-8-result.xml b/tests/cputestdata/x86-baseline-8-result.xml
deleted file mode 100644 (file)
index 88226b3..0000000
--- a/tests/cputestdata/x86-baseline-8-result.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Broadwell-noTSX</model>
-  <vendor>Intel</vendor>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-8.xml b/tests/cputestdata/x86-baseline-8.xml
deleted file mode 100644 (file)
index f1ee67d..0000000
--- a/tests/cputestdata/x86-baseline-8.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<cpuTest>
-    <cpu>
-      <arch>x86_64</arch>
-      <model>SandyBridge</model>
-      <vendor>Intel</vendor>
-      <topology sockets='1' cores='2' threads='2'/>
-      <feature name='invpcid'/>
-      <feature name='erms'/>
-      <feature name='bmi2'/>
-      <feature name='smep'/>
-      <feature name='avx2'/>
-      <feature name='bmi1'/>
-      <feature name='fsgsbase'/>
-      <feature name='movbe'/>
-      <feature name='pcid'/>
-      <feature name='fma'/>
-      <feature name='3dnowprefetch'/>
-      <feature name='rdseed'/>
-      <feature name='adx'/>
-      <feature name='smap'/>
-    </cpu>
-    <cpu>
-      <arch>x86_64</arch>
-      <model>Broadwell-noTSX</model>
-      <vendor>Intel</vendor>
-      <topology sockets='1' cores='2' threads='2'/>
-    </cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-incompatible-vendors.xml b/tests/cputestdata/x86-baseline-incompatible-vendors.xml
deleted file mode 100644 (file)
index ead1fbf..0000000
--- a/tests/cputestdata/x86-baseline-incompatible-vendors.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <vendor>Intel</vendor>
-  <topology sockets='2' cores='4' threads='1'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <topology sockets='1' cores='1' threads='1'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-no-vendor-result.xml b/tests/cputestdata/x86-baseline-no-vendor-result.xml
deleted file mode 100644 (file)
index 00e03b2..0000000
--- a/tests/cputestdata/x86-baseline-no-vendor-result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>cpu64-rhel6</model>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-no-vendor.xml b/tests/cputestdata/x86-baseline-no-vendor.xml
deleted file mode 100644 (file)
index 84605a4..0000000
--- a/tests/cputestdata/x86-baseline-no-vendor.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G3</model>
-  <topology sockets='1' cores='1' threads='1'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-baseline-some-vendors-result.xml b/tests/cputestdata/x86-baseline-some-vendors-result.xml
deleted file mode 100644 (file)
index 2927611..0000000
--- a/tests/cputestdata/x86-baseline-some-vendors-result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Opteron_G1</model>
-</cpu>

diff --git a/tests/cputestdata/x86-baseline-some-vendors.xml b/tests/cputestdata/x86-baseline-some-vendors.xml
deleted file mode 100644 (file)
index 816ed6b..0000000
--- a/tests/cputestdata/x86-baseline-some-vendors.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<cpuTest>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G1</model>
-  <topology sockets='2' cores='4' threads='1'/>
-</cpu>
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <topology sockets='1' cores='1' threads='1'/>
-</cpu>
-</cpuTest>

diff --git a/tests/cputestdata/x86-bogus-feature.xml b/tests/cputestdata/x86-bogus-feature.xml
deleted file mode 100644 (file)
index 5a11814..0000000
--- a/tests/cputestdata/x86-bogus-feature.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='minimum'>
-  <model>Penryn</model>
-  <feature name='bogus' policy='optional'/>
-</cpu>

diff --git a/tests/cputestdata/x86-bogus-model.xml b/tests/cputestdata/x86-bogus-model.xml
deleted file mode 100644 (file)
index f39392f..0000000
--- a/tests/cputestdata/x86-bogus-model.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu match='minimum'>
-  <model>Bogus</model>
-</cpu>

diff --git a/tests/cputestdata/x86-bogus-vendor.xml b/tests/cputestdata/x86-bogus-vendor.xml
deleted file mode 100644 (file)
index 2ffdefe..0000000
--- a/tests/cputestdata/x86-bogus-vendor.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='minimum'>
-  <model>Penryn</model>
-  <vendor>Bogus</vendor>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
deleted file mode 100644 (file)
index dacf1d0..0000000
--- a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G5</model>
-  <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='bmi1'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='extapic'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='require' name='ibs'/>
-  <feature policy='require' name='skinit'/>
-  <feature policy='require' name='wdt'/>
-  <feature policy='require' name='lwp'/>
-  <feature policy='require' name='tce'/>
-  <feature policy='require' name='nodeid_msr'/>
-  <feature policy='require' name='topoext'/>
-  <feature policy='require' name='perfctr_core'/>
-  <feature policy='require' name='perfctr_nb'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86-cpuid-A10-5800K-host.xml
deleted file mode 100644 (file)
index cb90c96..0000000
--- a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G5</model>
-  <vendor>AMD</vendor>
-  <feature name='vme'/>
-  <feature name='ht'/>
-  <feature name='monitor'/>
-  <feature name='osxsave'/>
-  <feature name='bmi1'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='cmp_legacy'/>
-  <feature name='extapic'/>
-  <feature name='cr8legacy'/>
-  <feature name='osvw'/>
-  <feature name='ibs'/>
-  <feature name='skinit'/>
-  <feature name='wdt'/>
-  <feature name='lwp'/>
-  <feature name='tce'/>
-  <feature name='nodeid_msr'/>
-  <feature name='topoext'/>
-  <feature name='perfctr_core'/>
-  <feature name='perfctr_nb'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86-cpuid-A10-5800K-json.xml
deleted file mode 100644 (file)
index 7a38f0f..0000000
--- a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G5</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='bmi1'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='disable' name='rdtscp'/>
-  <feature policy='disable' name='svm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K.json b/tests/cputestdata/x86-cpuid-A10-5800K.json
deleted file mode 100644 (file)
index 53b39ad..0000000
--- a/tests/cputestdata/x86-cpuid-A10-5800K.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 9
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 2165747
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 642779136
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 10
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 3065524739
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 21,
-  "id": "family"
-}
-
-{
-  "return": 16,
-  "id": "model"
-}
-
-{
-  "return": 1,
-  "id": "stepping"
-}
-
-{
-  "return": "AMD A10-5800K APU with Radeon(tm) HD Graphics  ",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-A10-5800K.xml b/tests/cputestdata/x86-cpuid-A10-5800K.xml
deleted file mode 100644 (file)
index 2889056..0000000
--- a/tests/cputestdata/x86-cpuid-A10-5800K.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- AMD A10-5800K APU with Radeon(tm) HD Graphics -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00610f01' ebx='0x00040800' ecx='0x3e98320b' edx='0x178bfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000008' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00610f01' ebx='0x20000000' ecx='0x01ebbfff' edx='0x2fd3fbff'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x2d303141' ecx='0x30303835' edx='0x5041204b'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x69772055' ebx='0x52206874' ecx='0x6f656461' edx='0x6d74286e'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x44482029' ebx='0x61724720' ecx='0x63696870' edx='0x00202073'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff40ff18' ebx='0xff40ff30' ecx='0x10040140' edx='0x40020140'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64006400' ebx='0x64004200' ecx='0x08008140' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000007d9'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00004003' edx='0x00000000'/>
-  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x00001cff'/>
-  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf040f018' ebx='0x64006400' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
-  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000010' ebx='0x00000100' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Atom-D510-guest.xml b/tests/cputestdata/x86-cpuid-Atom-D510-guest.xml
deleted file mode 100644 (file)
index 5e9efc7..0000000
--- a/tests/cputestdata/x86-cpuid-Atom-D510-guest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>core2duo</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='movbe'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='disable' name='syscall'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86-cpuid-Atom-D510-host.xml
deleted file mode 100644 (file)
index 8cf4341..0000000
--- a/tests/cputestdata/x86-cpuid-Atom-D510-host.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>n270</model>
-  <vendor>Intel</vendor>
-  <feature name='pse36'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='ds_cpl'/>
-  <feature name='tm2'/>
-  <feature name='cx16'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='movbe'/>
-  <feature name='lm'/>
-  <feature name='lahf_lm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Atom-D510.xml b/tests/cputestdata/x86-cpuid-Atom-D510.xml
deleted file mode 100644 (file)
index b5aed8e..0000000
--- a/tests/cputestdata/x86-cpuid-Atom-D510.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Intel(R) Atom(TM) CPU D510   @ 1.66GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000106ca' ebx='0x00040800' ecx='0x0040e31d' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x4fba5901' ebx='0x0e3080c0' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x04004121' ebx='0x0140003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x04004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x04004143' ebx='0x01c0003f' ecx='0x000003ff' edx='0x00000001'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000010'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100000'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x746e4920' edx='0x52286c65'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x74412029' ebx='0x54286d6f' ecx='0x4320294d' edx='0x44205550'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20303135' ebx='0x20402020' ecx='0x36362e31' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x02006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Atom-N450-guest.xml b/tests/cputestdata/x86-cpuid-Atom-N450-guest.xml
deleted file mode 100644 (file)
index be11b88..0000000
--- a/tests/cputestdata/x86-cpuid-Atom-N450-guest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>core2duo</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='movbe'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='disable' name='pse36'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86-cpuid-Atom-N450-host.xml
deleted file mode 100644 (file)
index c79713d..0000000
--- a/tests/cputestdata/x86-cpuid-Atom-N450-host.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>n270</model>
-  <vendor>Intel</vendor>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='ds_cpl'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='cx16'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='movbe'/>
-  <feature name='syscall'/>
-  <feature name='lm'/>
-  <feature name='lahf_lm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Atom-N450.xml b/tests/cputestdata/x86-cpuid-Atom-N450.xml
deleted file mode 100644 (file)
index 1852d67..0000000
--- a/tests/cputestdata/x86-cpuid-Atom-N450.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Intel(R) Atom(TM) CPU N450   @ 1.66GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000106ca' ebx='0x00020800' ecx='0x0040e39d' edx='0xbfe9fbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x4fba5901' ebx='0x0e3080c0' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x00004121' ebx='0x0140003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x00004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x00004143' ebx='0x01c0003f' ecx='0x000003ff' edx='0x00000001'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00020220'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x746e4920' edx='0x52286c65'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x74412029' ebx='0x54286d6f' ecx='0x4320294d' edx='0x4e205550'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20303534' ebx='0x20402020' ecx='0x36362e31' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x02006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003020' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
deleted file mode 100644 (file)
index 4c249eb..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
deleted file mode 100644 (file)
index a604acb..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='osxsave'/>
-  <feature name='arat'/>
-  <feature name='xsaveopt'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
deleted file mode 100644 (file)
index 980cf74..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500.json b/tests/cputestdata/x86-cpuid-Core-i5-2500.json
deleted file mode 100644 (file)
index 156b772..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545558019
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 42,
-  "id": "model"
-}
-
-{
-  "return": 7,
-  "id": "stepping"
-}
-
-{
-  "return": "        Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500.xml
deleted file mode 100644 (file)
index 0a33413..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x02100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b0ff' ecx='0x00000000' edx='0x00ca0000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300803' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000002'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000002'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x65746e49' edx='0x2952286c'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x726f4320' ebx='0x4d542865' ecx='0x35692029' edx='0x3035322d'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x50432030' ebx='0x20402055' ecx='0x30332e33' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml
deleted file mode 100644 (file)
index 4c249eb..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml
deleted file mode 100644 (file)
index a604acb..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='osxsave'/>
-  <feature name='arat'/>
-  <feature name='xsaveopt'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml
deleted file mode 100644 (file)
index 980cf74..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M.json b/tests/cputestdata/x86-cpuid-Core-i5-2540M.json
deleted file mode 100644 (file)
index 6dc2a80..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545558019
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 42,
-  "id": "model"
-}
-
-{
-  "return": 7,
-  "id": "stepping"
-}
-
-{
-  "return": "       Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M.xml b/tests/cputestdata/x86-cpuid-Core-i5-2540M.xml
deleted file mode 100644 (file)
index 3802d7d..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x03100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00000fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00021120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020' ecx='0x6c65746e' edx='0x20295228'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x65726f43' ebx='0x294d5428' ecx='0x2d356920' edx='0x30343532'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x5043204d' ebx='0x20402055' ecx='0x30362e32' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml
deleted file mode 100644 (file)
index 9c93995..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml
deleted file mode 100644 (file)
index b9f95ad..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Haswell</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='osxsave'/>
-  <feature name='f16c'/>
-  <feature name='rdrand'/>
-  <feature name='arat'/>
-  <feature name='tsc_adjust'/>
-  <feature name='pdpe1gb'/>
-  <feature name='abm'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
deleted file mode 100644 (file)
index c93688b..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T.json b/tests/cputestdata/x86-cpuid-Core-i5-4670T.json
deleted file mode 100644 (file)
index e715ca0..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 4027
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 60,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i5-4670T CPU @ 2.30GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T.xml
deleted file mode 100644 (file)
index 62960f9..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i5-4670T CPU @ 2.30GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306c3' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c10000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00042120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00002fbb' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300803' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x35692029' ebx='0x3736342d' ecx='0x43205430' edx='0x40205550'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x332e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
deleted file mode 100644 (file)
index 0ab5a7a..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Skylake-Client</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='xsaves'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
deleted file mode 100644 (file)
index c799394..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Skylake-Client</model>
-  <vendor>Intel</vendor>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='osxsave'/>
-  <feature name='tsc_adjust'/>
-  <feature name='clflushopt'/>
-  <feature name='xsaves'/>
-  <feature name='pdpe1gb'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
deleted file mode 100644 (file)
index 171b482..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Skylake-Client</model>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='xsaves'/>
-  <feature policy='require' name='pdpe1gb'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600.json b/tests/cputestdata/x86-cpuid-Core-i5-6600.json
deleted file mode 100644 (file)
index da296f9..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 15
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 289
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 10244027
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369155
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 94,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i5-6600 CPU @ 3.30GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600.xml
deleted file mode 100644 (file)
index cd0e63d..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- Intel(R) Core(TM) i5-6600 CPU @ 3.30GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x06100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c30000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000007f7' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbb' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300804' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000006'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000006'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000114' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x35692029' ebx='0x3036362d' ecx='0x50432030' edx='0x20402055'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30332e33' ebx='0x007a4847' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml
deleted file mode 100644 (file)
index 4c249eb..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml
deleted file mode 100644 (file)
index a604acb..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='osxsave'/>
-  <feature name='arat'/>
-  <feature name='xsaveopt'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml
deleted file mode 100644 (file)
index 27d9f35..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600.json b/tests/cputestdata/x86-cpuid-Core-i7-2600.json
deleted file mode 100644 (file)
index dd35449..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545558019
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 42,
-  "id": "model"
-}
-
-{
-  "return": 7,
-  "id": "stepping"
-}
-
-{
-  "return": "        Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600.xml b/tests/cputestdata/x86-cpuid-Core-i7-2600.xml
deleted file mode 100644 (file)
index ad15597..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x05100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000005'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x65746e49' edx='0x2952286c'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x726f4320' ebx='0x4d542865' ecx='0x37692029' edx='0x3036322d'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x50432030' ebx='0x20402055' ecx='0x30342e33' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml
deleted file mode 100644 (file)
index 776001f..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>IvyBridge</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml
deleted file mode 100644 (file)
index a23c651..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>IvyBridge</model>
-  <vendor>Intel</vendor>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='osxsave'/>
-  <feature name='arat'/>
-  <feature name='xsaveopt'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M.xml b/tests/cputestdata/x86-cpuid-Core-i7-3520M.xml
deleted file mode 100644 (file)
index 3010468..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3520M.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i7-3520M CPU @ 2.90GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306a9' ebx='0x03100800' ecx='0x7fbae3ff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00021120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000281' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020' ecx='0x6c65746e' edx='0x20295228'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x65726f43' ebx='0x294d5428' ecx='0x2d376920' edx='0x30323533'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x5043204d' ebx='0x20402055' ecx='0x30392e32' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-3740QM-guest.xml
deleted file mode 100644 (file)
index 90957e9..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-guest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>IvyBridge</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-3740QM-host.xml
deleted file mode 100644 (file)
index 9fec131..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-host.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>IvyBridge</model>
-  <vendor>Intel</vendor>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='osxsave'/>
-  <feature name='arat'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml
deleted file mode 100644 (file)
index 9adeecc..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>IvyBridge</model>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM.json b/tests/cputestdata/x86-cpuid-Core-i7-3740QM.json
deleted file mode 100644 (file)
index 2b1349f..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3740QM.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 643
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4156170787
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 58,
-  "id": "model"
-}
-
-{
-  "return": 9,
-  "id": "stepping"
-}
-
-{
-  "return": "      Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM.xml b/tests/cputestdata/x86-cpuid-Core-i7-3740QM.xml
deleted file mode 100644 (file)
index 3c40d11..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3740QM.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306a9' ebx='0x03100800' ecx='0x7fbae3ff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00021120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000281' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x6e492020' ecx='0x286c6574' edx='0x43202952'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x2865726f' ebx='0x20294d54' ecx='0x332d3769' edx='0x51303437'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x5043204d' ebx='0x20402055' ecx='0x30372e32' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml
deleted file mode 100644 (file)
index 776001f..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>IvyBridge</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml
deleted file mode 100644 (file)
index a23c651..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>IvyBridge</model>
-  <vendor>Intel</vendor>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='osxsave'/>
-  <feature name='arat'/>
-  <feature name='xsaveopt'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml
deleted file mode 100644 (file)
index a70ae48..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>IvyBridge</model>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770.json b/tests/cputestdata/x86-cpuid-Core-i7-3770.json
deleted file mode 100644 (file)
index d83e778..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 643
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4156170755
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 58,
-  "id": "model"
-}
-
-{
-  "return": 9,
-  "id": "stepping"
-}
-
-{
-  "return": "        Intel(R) Core(TM) i7-3770 CPU @ 3.40GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770.xml b/tests/cputestdata/x86-cpuid-Core-i7-3770.xml
deleted file mode 100644 (file)
index ebdd50e..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i7-3770 CPU @ 3.40GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306a9' ebx='0x05100800' ecx='0x7fbae3ff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000281' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000005'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x65746e49' edx='0x2952286c'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x726f4320' ebx='0x4d542865' ecx='0x37692029' edx='0x3737332d'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x50432030' ebx='0x20402055' ecx='0x30342e33' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
deleted file mode 100644 (file)
index b2aac64..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
deleted file mode 100644 (file)
index fae8e8d..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='osxsave'/>
-  <feature name='f16c'/>
-  <feature name='rdrand'/>
-  <feature name='arat'/>
-  <feature name='tsc_adjust'/>
-  <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='abm'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
deleted file mode 100644 (file)
index 5fa3146..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell-noTSX</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U.json b/tests/cputestdata/x86-cpuid-Core-i7-4600U.json
deleted file mode 100644 (file)
index 2b15fad..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1963
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 69,
-  "id": "model"
-}
-
-{
-  "return": 1,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml
deleted file mode 100644 (file)
index 4c0c259..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00040651' ebx='0x02100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c10000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000027ab' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000002'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036342d' ecx='0x43205530' edx='0x40205550'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x312e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
deleted file mode 100644 (file)
index cd7b4bb..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Broadwell</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
deleted file mode 100644 (file)
index 9b24941..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Broadwell</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='osxsave'/>
-  <feature name='f16c'/>
-  <feature name='rdrand'/>
-  <feature name='arat'/>
-  <feature name='tsc_adjust'/>
-  <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='abm'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
deleted file mode 100644 (file)
index 1597971..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Skylake-Client</model>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='disable' name='mpx'/>
-  <feature policy='disable' name='xsavec'/>
-  <feature policy='disable' name='xgetbv1'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U.json b/tests/cputestdata/x86-cpuid-Core-i7-5600U.json
deleted file mode 100644 (file)
index b570d46..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 289
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1839035
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 61,
-  "id": "model"
-}
-
-{
-  "return": 4,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U.xml
deleted file mode 100644 (file)
index ecb4a6e..0000000
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000014' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306d4' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x021c2fbb' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036352d' ecx='0x43205530' edx='0x40205550'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x362e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml b/tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml
deleted file mode 100644 (file)
index dfcbe24..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Conroe</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86-cpuid-Core2-E6850-host.xml
deleted file mode 100644 (file)
index e7ddc39..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-E6850-host.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Conroe</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='cx16'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-json.xml b/tests/cputestdata/x86-cpuid-Core2-E6850-json.xml
deleted file mode 100644 (file)
index ddd7307..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-E6850-json.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Penryn</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='disable' name='sse4.1'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850.json b/tests/cputestdata/x86-cpuid-Core2-E6850.json
deleted file mode 100644 (file)
index 44be368..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-E6850.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 537921536
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2166366721
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 15,
-  "id": "model"
-}
-
-{
-  "return": 11,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM)2 Duo CPU     E6850  @ 3.00GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850.xml b/tests/cputestdata/x86-cpuid-Core2-E6850.xml
deleted file mode 100644 (file)
index d832076..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-E6850.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Intel(R) Core(TM)2 Duo CPU     E6850  @ 3.00GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000006fb' ebx='0x01020800' ecx='0x0000e3fd' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43049'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x04000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x04000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x04004143' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000001'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000220'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x44203229' ebx='0x43206f75' ecx='0x20205550' edx='0x45202020'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30353836' ebx='0x20402020' ecx='0x30302e33' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x10008040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml b/tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml
deleted file mode 100644 (file)
index 37feefa..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Penryn</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <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='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='xsave'/>
-  <feature policy='require' name='osxsave'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml
deleted file mode 100644 (file)
index 4dc2558..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='xsave'/>
-  <feature name='osxsave'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500.xml b/tests/cputestdata/x86-cpuid-Core2-Q9500.xml
deleted file mode 100644 (file)
index 985263b..0000000
--- a/tests/cputestdata/x86-cpuid-Core2-Q9500.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Intel(R) Core(TM)2 Quad CPU    Q9500  @ 2.83GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x0001067a' ebx='0x03040800' ecx='0x0c08e3bd' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43048'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x0c000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x0c000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x0c004143' ebx='0x02c0003f' ecx='0x00000fff' edx='0x00000001'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00022220'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x51203229' ebx='0x20646175' ecx='0x20555043' edx='0x51202020'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30303539' ebx='0x20402020' ecx='0x33382e32' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0c006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-FX-8150-guest.xml b/tests/cputestdata/x86-cpuid-FX-8150-guest.xml
deleted file mode 100644 (file)
index 9858ee4..0000000
--- a/tests/cputestdata/x86-cpuid-FX-8150-guest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G4</model>
-  <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='extapic'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='require' name='ibs'/>
-  <feature policy='require' name='skinit'/>
-  <feature policy='require' name='wdt'/>
-  <feature policy='require' name='lwp'/>
-  <feature policy='require' name='nodeid_msr'/>
-  <feature policy='require' name='topoext'/>
-  <feature policy='require' name='perfctr_core'/>
-  <feature policy='require' name='perfctr_nb'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-FX-8150-host.xml b/tests/cputestdata/x86-cpuid-FX-8150-host.xml
deleted file mode 100644 (file)
index ec670c6..0000000
--- a/tests/cputestdata/x86-cpuid-FX-8150-host.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G4</model>
-  <vendor>AMD</vendor>
-  <feature name='vme'/>
-  <feature name='ht'/>
-  <feature name='monitor'/>
-  <feature name='osxsave'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='cmp_legacy'/>
-  <feature name='extapic'/>
-  <feature name='cr8legacy'/>
-  <feature name='osvw'/>
-  <feature name='ibs'/>
-  <feature name='skinit'/>
-  <feature name='wdt'/>
-  <feature name='lwp'/>
-  <feature name='nodeid_msr'/>
-  <feature name='topoext'/>
-  <feature name='perfctr_core'/>
-  <feature name='perfctr_nb'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-FX-8150.xml b/tests/cputestdata/x86-cpuid-FX-8150.xml
deleted file mode 100644 (file)
index 20ac45d..0000000
--- a/tests/cputestdata/x86-cpuid-FX-8150.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00600f12' ebx='0x03080800' ecx='0x1e98220b' edx='0x178bfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00600f12' ebx='0x10000000' ecx='0x01c9bfff' edx='0x2fd3fbff'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x74285846' ecx='0x382d296d' edx='0x20303531'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x68676945' ebx='0x6f432d74' ecx='0x50206572' edx='0x65636f72'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x726f7373' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff20ff18' ebx='0xff20ff30' ecx='0x10040140' edx='0x40020140'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64000000' ebx='0x64004200' ecx='0x08008140' edx='0x0040c140'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000003d9'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00004007' edx='0x00000000'/>
-  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x000014ff'/>
-  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf020f018' ebx='0x64000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
-  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000001' ebx='0x00000101' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86-cpuid-Opteron-1352-guest.xml
deleted file mode 100644 (file)
index 828a142..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-1352-guest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='extapic'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='3dnowprefetch'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='require' name='ibs'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86-cpuid-Opteron-1352-host.xml
deleted file mode 100644 (file)
index 399398e..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-1352-host.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <feature name='vme'/>
-  <feature name='ht'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='3dnowext'/>
-  <feature name='3dnow'/>
-  <feature name='cmp_legacy'/>
-  <feature name='extapic'/>
-  <feature name='cr8legacy'/>
-  <feature name='3dnowprefetch'/>
-  <feature name='osvw'/>
-  <feature name='ibs'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-1352.xml b/tests/cputestdata/x86-cpuid-Opteron-1352.xml
deleted file mode 100644 (file)
index f3c2026..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-1352.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Quad-Core AMD Opteron(tm) Processor 1352 -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000005' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00100f23' ebx='0x01040800' ecx='0x00802009' edx='0x178bfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001a' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00100f23' ebx='0x1000034f' ecx='0x000007ff' edx='0xefd3fbff'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x64617551' ebx='0x726f432d' ecx='0x4d412065' edx='0x704f2044'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6f726574' ebx='0x6d74286e' ecx='0x72502029' edx='0x7365636f'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20726f73' ebx='0x32353331' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff30ff10' ebx='0xff30ff20' ecx='0x40020140' edx='0x40020140'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x20800000' ebx='0x42004200' ecx='0x02008140' edx='0x0010a140'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000001f9'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00002003' edx='0x00000000'/>
-  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00000040' ecx='0x00000000' edx='0x00000007'/>
-  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf0300000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86-cpuid-Opteron-2350-guest.xml
deleted file mode 100644 (file)
index 828a142..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-2350-guest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='extapic'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='3dnowprefetch'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='require' name='ibs'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86-cpuid-Opteron-2350-host.xml
deleted file mode 100644 (file)
index 399398e..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-2350-host.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <feature name='vme'/>
-  <feature name='ht'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='3dnowext'/>
-  <feature name='3dnow'/>
-  <feature name='cmp_legacy'/>
-  <feature name='extapic'/>
-  <feature name='cr8legacy'/>
-  <feature name='3dnowprefetch'/>
-  <feature name='osvw'/>
-  <feature name='ibs'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86-cpuid-Opteron-2350-json.xml
deleted file mode 100644 (file)
index be4cf5c..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-2350-json.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G3</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='3dnowprefetch'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='disable' name='monitor'/>
-  <feature policy='disable' name='rdtscp'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350.json b/tests/cputestdata/x86-cpuid-Opteron-2350.json
deleted file mode 100644 (file)
index 79b5afa..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-2350.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1015
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 3864004608
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2174754817
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 16,
-  "id": "family"
-}
-
-{
-  "return": 2,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Quad-Core AMD Opteron(tm) Processor 2350",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350.xml b/tests/cputestdata/x86-cpuid-Opteron-2350.xml
deleted file mode 100644 (file)
index a928111..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-2350.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Quad-Core AMD Opteron(tm) Processor 2350 -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000005' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00100f23' ebx='0x01040800' ecx='0x00802009' edx='0x178bfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001a' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00100f23' ebx='0x00000b2f' ecx='0x000007ff' edx='0xefd3fbff'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x64617551' ebx='0x726f432d' ecx='0x4d412065' edx='0x704f2044'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6f726574' ebx='0x6d74286e' ecx='0x72502029' edx='0x7365636f'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20726f73' ebx='0x30353332' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff30ff10' ebx='0xff30ff20' ecx='0x40020140' edx='0x40020140'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x20800000' ebx='0x42004200' ecx='0x02008140' edx='0x0010a140'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000001f9'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00002003' edx='0x00000000'/>
-  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00000040' ecx='0x00000000' edx='0x00000007'/>
-  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf0300000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-guest.xml b/tests/cputestdata/x86-cpuid-Opteron-6234-guest.xml
deleted file mode 100644 (file)
index 9858ee4..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6234-guest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G4</model>
-  <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='extapic'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='require' name='ibs'/>
-  <feature policy='require' name='skinit'/>
-  <feature policy='require' name='wdt'/>
-  <feature policy='require' name='lwp'/>
-  <feature policy='require' name='nodeid_msr'/>
-  <feature policy='require' name='topoext'/>
-  <feature policy='require' name='perfctr_core'/>
-  <feature policy='require' name='perfctr_nb'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86-cpuid-Opteron-6234-host.xml
deleted file mode 100644 (file)
index ec670c6..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6234-host.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G4</model>
-  <vendor>AMD</vendor>
-  <feature name='vme'/>
-  <feature name='ht'/>
-  <feature name='monitor'/>
-  <feature name='osxsave'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='cmp_legacy'/>
-  <feature name='extapic'/>
-  <feature name='cr8legacy'/>
-  <feature name='osvw'/>
-  <feature name='ibs'/>
-  <feature name='skinit'/>
-  <feature name='wdt'/>
-  <feature name='lwp'/>
-  <feature name='nodeid_msr'/>
-  <feature name='topoext'/>
-  <feature name='perfctr_core'/>
-  <feature name='perfctr_nb'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml
deleted file mode 100644 (file)
index 2e28342..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G4</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='tsc-deadline'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='disable' name='rdtscp'/>
-  <feature policy='disable' name='svm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234.json b/tests/cputestdata/x86-cpuid-Opteron-6234.json
deleted file mode 100644 (file)
index 0df3860..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6234.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 9
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 68595
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 668204031
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545426947
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 21,
-  "id": "family"
-}
-
-{
-  "return": 1,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "AMD Opteron(TM) Processor 6234                 ",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234.xml b/tests/cputestdata/x86-cpuid-Opteron-6234.xml
deleted file mode 100644 (file)
index 9a89fd7..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6234.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- AMD Opteron(TM) Processor 6234 -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00600f12' ebx='0x230c0800' ecx='0x1e98220b' edx='0x178bfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00600f12' ebx='0x30000000' ecx='0x01c9bfff' edx='0x2fd3fbff'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x6574704f' ecx='0x286e6f72' edx='0x20294d54'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x636f7250' ebx='0x6f737365' ecx='0x32362072' edx='0x20203433'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff20ff18' ebx='0xff20ff30' ecx='0x10040140' edx='0x40020140'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64000000' ebx='0x64004200' ecx='0x08008140' edx='0x0060e140'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000003d9'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x0000500b' edx='0x00000000'/>
-  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x000014ff'/>
-  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf020f018' ebx='0x64000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
-  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000043' ebx='0x00000101' ecx='0x00000102' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6282-guest.xml b/tests/cputestdata/x86-cpuid-Opteron-6282-guest.xml
deleted file mode 100644 (file)
index 9858ee4..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6282-guest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G4</model>
-  <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='extapic'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='require' name='ibs'/>
-  <feature policy='require' name='skinit'/>
-  <feature policy='require' name='wdt'/>
-  <feature policy='require' name='lwp'/>
-  <feature policy='require' name='nodeid_msr'/>
-  <feature policy='require' name='topoext'/>
-  <feature policy='require' name='perfctr_core'/>
-  <feature policy='require' name='perfctr_nb'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86-cpuid-Opteron-6282-host.xml
deleted file mode 100644 (file)
index ec670c6..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6282-host.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G4</model>
-  <vendor>AMD</vendor>
-  <feature name='vme'/>
-  <feature name='ht'/>
-  <feature name='monitor'/>
-  <feature name='osxsave'/>
-  <feature name='mmxext'/>
-  <feature name='fxsr_opt'/>
-  <feature name='cmp_legacy'/>
-  <feature name='extapic'/>
-  <feature name='cr8legacy'/>
-  <feature name='osvw'/>
-  <feature name='ibs'/>
-  <feature name='skinit'/>
-  <feature name='wdt'/>
-  <feature name='lwp'/>
-  <feature name='nodeid_msr'/>
-  <feature name='topoext'/>
-  <feature name='perfctr_core'/>
-  <feature name='perfctr_nb'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Opteron-6282.xml b/tests/cputestdata/x86-cpuid-Opteron-6282.xml
deleted file mode 100644 (file)
index 6e6b81d..0000000
--- a/tests/cputestdata/x86-cpuid-Opteron-6282.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- AMD Opteron(tm) Processor 6282 SE -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00600f12' ebx='0x0b100800' ecx='0x1e98220b' edx='0x178bfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00600f12' ebx='0x30000000' ecx='0x01c9bfff' edx='0x2fd3fbff'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x6574704f' ecx='0x286e6f72' edx='0x20296d74'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x636f7250' ebx='0x6f737365' ecx='0x32362072' edx='0x53203238'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20202045' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff20ff18' ebx='0xff20ff30' ecx='0x10040140' edx='0x40020140'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64000000' ebx='0x64004200' ecx='0x08008140' edx='0x0060e140'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000003d9'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x0000500f' edx='0x00000000'/>
-  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x000014ff'/>
-  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf020f018' ebx='0x64000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
-  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x0000002b' ebx='0x00000105' ecx='0x00000101' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Pentium-P6100-guest.xml b/tests/cputestdata/x86-cpuid-Pentium-P6100-guest.xml
deleted file mode 100644 (file)
index f893f9f..0000000
--- a/tests/cputestdata/x86-cpuid-Pentium-P6100-guest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>core2duo</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='popcnt'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='rdtscp'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86-cpuid-Pentium-P6100-host.xml
deleted file mode 100644 (file)
index 3975aa7..0000000
--- a/tests/cputestdata/x86-cpuid-Pentium-P6100-host.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>core2duo</model>
-  <vendor>Intel</vendor>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='ds_cpl'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='cx16'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='popcnt'/>
-  <feature name='arat'/>
-  <feature name='rdtscp'/>
-  <feature name='lahf_lm'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Pentium-P6100.xml b/tests/cputestdata/x86-cpuid-Pentium-P6100.xml
deleted file mode 100644 (file)
index 0d63060..0000000
--- a/tests/cputestdata/x86-cpuid-Pentium-P6100.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Intel(R) Pentium(R) CPU        P6100  @ 2.00GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00020655' ebx='0x00100800' ecx='0x0082e39d' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b0dd' ecx='0x00000000' edx='0x09ca212c'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x00c0003f' ecx='0x0000007f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00000fff' edx='0x00000002'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000005' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000004' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000002' ecx='0x00000201' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6e655020' edx='0x6d756974'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x20295228' ebx='0x20555043' ecx='0x20202020' edx='0x50202020'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30303136' ebx='0x20402020' ecx='0x30302e32' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86-cpuid-Phenom-B95-guest.xml
deleted file mode 100644 (file)
index 60ba9c1..0000000
--- a/tests/cputestdata/x86-cpuid-Phenom-B95-guest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='extapic'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='3dnowprefetch'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='require' name='ibs'/>
-  <feature policy='require' name='skinit'/>
-  <feature policy='require' name='wdt'/>
-  <feature policy='require' name='invtsc'/>
-  <feature policy='disable' name='nx'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86-cpuid-Phenom-B95-host.xml
deleted file mode 100644 (file)
index 127b047..0000000
--- a/tests/cputestdata/x86-cpuid-Phenom-B95-host.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>athlon</model>
-  <vendor>AMD</vendor>
-  <feature name='mca'/>
-  <feature name='clflush'/>
-  <feature name='ht'/>
-  <feature name='pni'/>
-  <feature name='monitor'/>
-  <feature name='cx16'/>
-  <feature name='popcnt'/>
-  <feature name='syscall'/>
-  <feature name='fxsr_opt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='rdtscp'/>
-  <feature name='lm'/>
-  <feature name='lahf_lm'/>
-  <feature name='cmp_legacy'/>
-  <feature name='svm'/>
-  <feature name='extapic'/>
-  <feature name='cr8legacy'/>
-  <feature name='abm'/>
-  <feature name='sse4a'/>
-  <feature name='misalignsse'/>
-  <feature name='3dnowprefetch'/>
-  <feature name='osvw'/>
-  <feature name='ibs'/>
-  <feature name='skinit'/>
-  <feature name='wdt'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86-cpuid-Phenom-B95-json.xml
deleted file mode 100644 (file)
index c1070de..0000000
--- a/tests/cputestdata/x86-cpuid-Phenom-B95-json.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Opteron_G3</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='mmxext'/>
-  <feature policy='require' name='fxsr_opt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='3dnowext'/>
-  <feature policy='require' name='3dnow'/>
-  <feature policy='require' name='cmp_legacy'/>
-  <feature policy='require' name='cr8legacy'/>
-  <feature policy='require' name='3dnowprefetch'/>
-  <feature policy='require' name='osvw'/>
-  <feature policy='disable' name='monitor'/>
-  <feature policy='disable' name='nx'/>
-  <feature policy='disable' name='rdtscp'/>
-  <feature policy='disable' name='svm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95.json b/tests/cputestdata/x86-cpuid-Phenom-B95.json
deleted file mode 100644 (file)
index 5f5badd..0000000
--- a/tests/cputestdata/x86-cpuid-Phenom-B95.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 9
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1011
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 3862956032
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2157977601
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 16,
-  "id": "family"
-}
-
-{
-  "return": 4,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "AMD Phenom(tm) II X4 B95 Processor",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95.xml b/tests/cputestdata/x86-cpuid-Phenom-B95.xml
deleted file mode 100644 (file)
index ad989f9..0000000
--- a/tests/cputestdata/x86-cpuid-Phenom-B95.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- AMD Phenom(tm) II X4 B95 Processor -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000005' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00100f42' ebx='0x00040800' ecx='0x00802009' edx='0x178bfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001b' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00100f42' ebx='0x10003df6' ecx='0x000037ff' edx='0xefc3fbff'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x6e656850' ecx='0x74286d6f' edx='0x4920296d'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x34582049' ebx='0x35394220' ecx='0x6f725020' edx='0x73736563'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x0000726f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff30ff10' ebx='0xff30ff20' ecx='0x40020140' edx='0x40020140'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x20800000' ebx='0x42004200' ecx='0x02008140' edx='0x0030b140'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000001f9'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00002003' edx='0x00000000'/>
-  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00000040' ecx='0x00000000' edx='0x0000000f'/>
-  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf0300000' ebx='0x60100000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x0000001f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-5110-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-5110-guest.xml
deleted file mode 100644 (file)
index 28d112b..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-5110-guest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Conroe</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='cx16'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='dca'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86-cpuid-Xeon-5110-host.xml
deleted file mode 100644 (file)
index ca3a84c..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-5110-host.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Conroe</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='tm2'/>
-  <feature name='cx16'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='dca'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-5110.xml b/tests/cputestdata/x86-cpuid-Xeon-5110.xml
deleted file mode 100644 (file)
index 557c7dc..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-5110.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Intel(R) Xeon(R) CPU            5110  @ 1.60GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000006f6' ebx='0x07020800' ecx='0x0004e33d' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43049'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x04000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x04000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x04004143' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000001'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000020'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x20202020' ecx='0x20202020' edx='0x20202020'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30313135' ebx='0x20402020' ecx='0x30362e31' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x10008040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
deleted file mode 100644 (file)
index 0ab5a7a..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Skylake-Client</model>
-  <vendor>Intel</vendor>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='xsaves'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
deleted file mode 100644 (file)
index c799394..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Skylake-Client</model>
-  <vendor>Intel</vendor>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='osxsave'/>
-  <feature name='tsc_adjust'/>
-  <feature name='clflushopt'/>
-  <feature name='xsaves'/>
-  <feature name='pdpe1gb'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
deleted file mode 100644 (file)
index 7a8246e..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Skylake-Client</model>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='clflushopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245.json b/tests/cputestdata/x86-cpuid-Xeon-E3-1245.json
deleted file mode 100644 (file)
index 10fbe06..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 7
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 289
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 10244027
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 94,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245.xml
deleted file mode 100644 (file)
index 42992db..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000124' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000dac' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d334520' ecx='0x35343231' edx='0x20357620'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e332040' ebx='0x48473035' ecx='0x0000007a' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000dac' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000dac' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
deleted file mode 100644 (file)
index b02d963..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='cmt'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
deleted file mode 100644 (file)
index 431a737..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='dca'/>
-  <feature name='osxsave'/>
-  <feature name='f16c'/>
-  <feature name='rdrand'/>
-  <feature name='arat'/>
-  <feature name='tsc_adjust'/>
-  <feature name='cmt'/>
-  <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='abm'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
deleted file mode 100644 (file)
index 6b4edc3..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell-noTSX</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.json b/tests/cputestdata/x86-cpuid-Xeon-E5-2630.json
deleted file mode 100644 (file)
index f1affa4..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1963
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369155
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 63,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml
deleted file mode 100644 (file)
index dc640ac..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000f' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306f2' ebx='0x13100800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c10000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x04c0003f' ecx='0x00003fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000037ab' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000013'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000010' ecx='0x00000201' edx='0x00000013'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000001f' ecx='0x00000000' edx='0x00000002'/>
-  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00008000' ecx='0x0000001f' edx='0x00000001'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d354520' ecx='0x30333632' edx='0x20337620'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e322040' ebx='0x48473034' ecx='0x0000007a' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x0000001f' ecx='0x00000000' edx='0x00000002'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x0000001f' ecx='0x00000000' edx='0x00000002'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
deleted file mode 100644 (file)
index b02d963..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='cmt'/>
-  <feature policy='require' name='xsaveopt'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
deleted file mode 100644 (file)
index 431a737..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='dca'/>
-  <feature name='osxsave'/>
-  <feature name='f16c'/>
-  <feature name='rdrand'/>
-  <feature name='arat'/>
-  <feature name='tsc_adjust'/>
-  <feature name='cmt'/>
-  <feature name='xsaveopt'/>
-  <feature name='pdpe1gb'/>
-  <feature name='abm'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-json.xml
deleted file mode 100644 (file)
index 36b7bf2..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-json.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Haswell-noTSX</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='f16c'/>
-  <feature policy='require' name='rdrand'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='abm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650.json b/tests/cputestdata/x86-cpuid-Xeon-E5-2650.json
deleted file mode 100644 (file)
index 2cd15f6..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1961
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 63,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU E5-2650 v3 @ 2.30GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650.xml
deleted file mode 100644 (file)
index 2b73adf..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Intel(R) Xeon(R) CPU E5-2650 v3 @ 2.30GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000f' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306f2' ebx='0x03200800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c10000'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x04c0003f' ecx='0x00004fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000037ab' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x00000014' ecx='0x00000201' edx='0x00000003'/>
-  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000027' ecx='0x00000000' edx='0x00000002'/>
-  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x0000a000' ecx='0x00000027' edx='0x00000001'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d354520' ecx='0x30353632' edx='0x20337620'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e322040' ebx='0x48473033' ecx='0x0000007a' edx='0x00000000'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000027' ecx='0x00000000' edx='0x00000002'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000027' ecx='0x00000000' edx='0x00000002'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E7-4820-guest.xml
deleted file mode 100644 (file)
index 81bf8c8..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-guest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='arat'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='require' name='invtsc'/>
-  <feature policy='disable' name='tsc-deadline'/>
-  <feature policy='disable' name='xsave'/>
-  <feature policy='disable' name='avx'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E7-4820-host.xml
deleted file mode 100644 (file)
index 5290247..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-host.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Westmere</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='pclmuldq'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='smx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='pcid'/>
-  <feature name='dca'/>
-  <feature name='x2apic'/>
-  <feature name='arat'/>
-  <feature name='pdpe1gb'/>
-  <feature name='rdtscp'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml
deleted file mode 100644 (file)
index ff6ab65..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>SandyBridge</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='pdpe1gb'/>
-  <feature policy='disable' name='xsave'/>
-  <feature policy='disable' name='avx'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820.json b/tests/cputestdata/x86-cpuid-Xeon-E7-4820.json
deleted file mode 100644 (file)
index a884613..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E7-4820.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2210013699
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 47,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "       Intel(R) Xeon(R) CPU E7- 4820  @ 2.00GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820.xml b/tests/cputestdata/x86-cpuid-Xeon-E7-4820.xml
deleted file mode 100644 (file)
index c0d9982..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-E7-4820.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Intel(R) Xeon(R) CPU E7- 4820  @ 2.00GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206f2' ebx='0x02400800' ecx='0x02bee3ff' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b0eb' ecx='0x00000000' edx='0x09ca212c'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x7c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x7c004122' ebx='0x00c0003f' ecx='0x0000007f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x7c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x7c0fc163' ebx='0x05c0003f' ecx='0x00002fff' edx='0x00000006'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000007' ebx='0x00000001' ecx='0x00000009' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000004' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000006' ebx='0x00000010' ecx='0x00000201' edx='0x00000002'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x2c100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020' ecx='0x6c65746e' edx='0x20295228'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6e6f6558' ebx='0x20295228' ecx='0x20555043' edx='0x202d3745'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30323834' ebx='0x20402020' ecx='0x30302e32' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302c' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml
deleted file mode 100644 (file)
index 4037fa6..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Nehalem</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <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='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='rdtscp'/>
-  <feature policy='require' name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml
deleted file mode 100644 (file)
index c4a9226..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Nehalem</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='dca'/>
-  <feature name='rdtscp'/>
-  <feature name='invtsc'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
deleted file mode 100644 (file)
index 1aadbf3..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Nehalem</model>
-  <feature policy='require' name='vme'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='x2apic'/>
-  <feature policy='require' name='hypervisor'/>
-  <feature policy='require' name='tsc_adjust'/>
-  <feature policy='require' name='rdtscp'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520.json b/tests/cputestdata/x86-cpuid-Xeon-W3520.json
deleted file mode 100644 (file)
index c75594d..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-W3520.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2159550977
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 26,
-  "id": "model"
-}
-
-{
-  "return": 5,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU           W3520  @ 2.67GHz",
-  "id": "model-id"
-}

diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520.xml
deleted file mode 100644 (file)
index 0d357f7..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-W3520.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Intel(R) Xeon(R) CPU           W3520  @ 2.67GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000106a5' ebx='0x05100800' ecx='0x009ce3bd' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b2e4' ecx='0x00000000' edx='0x09ca212c'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x00c0003f' ecx='0x0000007f' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000002'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000003' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000044' ecx='0x00000000' edx='0x00000603'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000005'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x20202020' ecx='0x20202020' edx='0x57202020'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30323533' ebx='0x20402020' ecx='0x37362e32' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-X5460-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-X5460-guest.xml
deleted file mode 100644 (file)
index 9e21934..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-X5460-guest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='forbid'>Penryn</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='vme'/>
-  <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='dtes64'/>
-  <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='xtpr'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='dca'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86-cpuid-Xeon-X5460-host.xml
deleted file mode 100644 (file)
index e73c478..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-X5460-host.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <vendor>Intel</vendor>
-  <feature name='vme'/>
-  <feature name='ds'/>
-  <feature name='acpi'/>
-  <feature name='ss'/>
-  <feature name='ht'/>
-  <feature name='tm'/>
-  <feature name='pbe'/>
-  <feature name='dtes64'/>
-  <feature name='monitor'/>
-  <feature name='ds_cpl'/>
-  <feature name='vmx'/>
-  <feature name='est'/>
-  <feature name='tm2'/>
-  <feature name='xtpr'/>
-  <feature name='pdcm'/>
-  <feature name='dca'/>
-</cpu>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-X5460.xml b/tests/cputestdata/x86-cpuid-Xeon-X5460.xml
deleted file mode 100644 (file)
index 5e58a3f..0000000
--- a/tests/cputestdata/x86-cpuid-Xeon-X5460.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Intel(R) Xeon(R) CPU           X5460  @ 3.16GHz -->
-<cpudata arch='x86'>
-  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00010676' ebx='0x01040800' ecx='0x000ce3bd' edx='0xbfebfbff'/>
-  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb4304e'/>
-  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x0c000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x0c000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
-  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x0c004143' ebx='0x05c0003f' ecx='0x00000fff' edx='0x00000001'/>
-  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002220'/>
-  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
-  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x20202020' ecx='0x20202020' edx='0x58202020'/>
-  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30363435' ebx='0x20402020' ecx='0x36312e33' edx='0x007a4847'/>
-  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x18008040' edx='0x00000000'/>
-  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003026' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
-</cpudata>

diff --git a/tests/cputestdata/x86-exact-disable-extra.xml b/tests/cputestdata/x86-exact-disable-extra.xml
deleted file mode 100644 (file)
index c84bd5b..0000000
--- a/tests/cputestdata/x86-exact-disable-extra.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='3dnowext' policy='disable'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-disable.xml b/tests/cputestdata/x86-exact-disable.xml
deleted file mode 100644 (file)
index 202eb27..0000000
--- a/tests/cputestdata/x86-exact-disable.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='vmx' policy='disable'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-disable2.xml b/tests/cputestdata/x86-exact-disable2.xml
deleted file mode 100644 (file)
index 9baa58b..0000000
--- a/tests/cputestdata/x86-exact-disable2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<cpu match='exact'>
-  <model>Nehalem</model>
-  <feature name='popcnt' policy='disable'/>
-  <feature name='sse4.2' policy='disable'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-forbid-extra.xml b/tests/cputestdata/x86-exact-forbid-extra.xml
deleted file mode 100644 (file)
index 0a261ad..0000000
--- a/tests/cputestdata/x86-exact-forbid-extra.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='3dnowext' policy='forbid'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-forbid.xml b/tests/cputestdata/x86-exact-forbid.xml
deleted file mode 100644 (file)
index d9660ca..0000000
--- a/tests/cputestdata/x86-exact-forbid.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='vmx' policy='forbid'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-force-Haswell.xml b/tests/cputestdata/x86-exact-force-Haswell.xml
deleted file mode 100644 (file)
index 614ed7e..0000000
--- a/tests/cputestdata/x86-exact-force-Haswell.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Haswell</model>
-  <feature policy='force' name='pcid'/>
-  <feature policy='force' name='rtm'/>
-  <feature policy='force' name='invpcid'/>
-  <feature policy='force' name='erms'/>
-  <feature policy='force' name='bmi2'/>
-  <feature policy='optional' name='smep'/>
-  <feature policy='optional' name='avx2'/>
-  <feature policy='optional' name='hle'/>
-  <feature policy='force' name='bmi1'/>
-  <feature policy='force' name='fsgsbase'/>
-  <feature policy='disable' name='movbe'/>
-  <feature policy='disable' name='fma'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-force.xml b/tests/cputestdata/x86-exact-force.xml
deleted file mode 100644 (file)
index c0fa127..0000000
--- a/tests/cputestdata/x86-exact-force.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='3dnowext' policy='force'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-require-extra.xml b/tests/cputestdata/x86-exact-require-extra.xml
deleted file mode 100644 (file)
index 5e89cda..0000000
--- a/tests/cputestdata/x86-exact-require-extra.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='3dnowext' policy='require'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact-require.xml b/tests/cputestdata/x86-exact-require.xml
deleted file mode 100644 (file)
index 2d196df..0000000
--- a/tests/cputestdata/x86-exact-require.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='sse4.1' policy='require'/>
-</cpu>

diff --git a/tests/cputestdata/x86-exact.xml b/tests/cputestdata/x86-exact.xml
deleted file mode 100644 (file)
index 18b7ef4..0000000
--- a/tests/cputestdata/x86-exact.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-</cpu>

diff --git a/tests/cputestdata/x86-guest-nofallback.xml b/tests/cputestdata/x86-guest-nofallback.xml
deleted file mode 100644 (file)
index babe47d..0000000
--- a/tests/cputestdata/x86-guest-nofallback.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpu match='exact'>
-  <model fallback='forbid'>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <!--feature name='sse4.1' policy='optional'/-->
-  <feature name='dca' policy='optional'/>
-  <feature name='xtpr' policy='optional'/>
-  <feature name='sse4.2' policy='optional'/>
-  <feature name='3dnow' policy='optional'/>
-  <feature name='ssse3' policy='optional'/>
-  <feature name='vmx' policy='disable'/>
-  <feature name='ds_cpl' policy='disable'/>
-  <feature name='sse' policy='disable'/>
-  <feature name='monitor' policy='force'/>
-  <feature name='pbe' policy='force'/>
-  <feature name='3dnowext' policy='force'/>
-  <feature name='svm' policy='force'/>
-  <feature name='popcnt' policy='forbid'/>
-</cpu>

diff --git a/tests/cputestdata/x86-guest.xml b/tests/cputestdata/x86-guest.xml
deleted file mode 100644 (file)
index d8685e6..0000000
--- a/tests/cputestdata/x86-guest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <!--feature name='sse4.1' policy='optional'/-->
-  <feature name='dca' policy='optional'/>
-  <feature name='xtpr' policy='optional'/>
-  <feature name='sse4.2' policy='optional'/>
-  <feature name='3dnow' policy='optional'/>
-  <feature name='ssse3' policy='optional'/>
-  <feature name='vmx' policy='disable'/>
-  <feature name='ds_cpl' policy='disable'/>
-  <feature name='sse' policy='disable'/>
-  <feature name='monitor' policy='force'/>
-  <feature name='pbe' policy='force'/>
-  <feature name='3dnowext' policy='force'/>
-  <feature name='svm' policy='force'/>
-  <feature name='popcnt' policy='forbid'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+guest,model486-result.xml b/tests/cputestdata/x86-host+guest,model486-result.xml
deleted file mode 100644 (file)
index 85564ff..0000000
--- a/tests/cputestdata/x86-host+guest,model486-result.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>486</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature policy='require' name='de'/>
-  <feature policy='require' name='tsc'/>
-  <feature policy='require' name='msr'/>
-  <feature policy='require' name='pae'/>
-  <feature policy='require' name='mce'/>
-  <feature policy='require' name='cx8'/>
-  <feature policy='require' name='apic'/>
-  <feature policy='require' name='sep'/>
-  <feature policy='require' name='mtrr'/>
-  <feature policy='require' name='pge'/>
-  <feature policy='require' name='mca'/>
-  <feature policy='require' name='cmov'/>
-  <feature policy='require' name='pat'/>
-  <feature policy='require' name='pse36'/>
-  <feature policy='require' name='clflush'/>
-  <feature policy='require' name='mmx'/>
-  <feature policy='require' name='fxsr'/>
-  <feature policy='require' name='sse2'/>
-  <feature policy='force' name='pbe'/>
-  <feature policy='require' name='pni'/>
-  <feature policy='force' name='monitor'/>
-  <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='syscall'/>
-  <feature policy='require' name='nx'/>
-  <feature policy='require' name='lm'/>
-  <feature policy='force' name='3dnowext'/>
-  <feature policy='require' name='lahf_lm'/>
-  <feature policy='force' name='svm'/>
-  <feature policy='disable' name='vme'/>
-  <feature policy='disable' name='sse4.2'/>
-  <feature policy='disable' name='3dnow'/>
-  <feature policy='disable' name='vmx'/>
-  <feature policy='disable' name='ds_cpl'/>
-  <feature policy='disable' name='sse'/>
-  <feature policy='forbid' name='popcnt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+guest,models-result.xml b/tests/cputestdata/x86-host+guest,models-result.xml
deleted file mode 100644 (file)
index f79ed32..0000000
--- a/tests/cputestdata/x86-host+guest,models-result.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Nehalem</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature policy='force' name='pbe'/>
-  <feature policy='force' name='monitor'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='force' name='3dnowext'/>
-  <feature policy='force' name='svm'/>
-  <feature policy='disable' name='sse'/>
-  <feature policy='disable' name='sse4.2'/>
-  <feature policy='forbid' name='popcnt'/>
-  <feature policy='disable' name='3dnow'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='disable' name='vmx'/>
-  <feature policy='disable' name='ds_cpl'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+guest-result.xml b/tests/cputestdata/x86-host+guest-result.xml
deleted file mode 100644 (file)
index 137a3d6..0000000
--- a/tests/cputestdata/x86-host+guest-result.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='disable' name='sse4.2'/>
-  <feature policy='disable' name='3dnow'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='disable' name='vmx'/>
-  <feature policy='disable' name='ds_cpl'/>
-  <feature policy='disable' name='sse'/>
-  <feature policy='force' name='monitor'/>
-  <feature policy='force' name='pbe'/>
-  <feature policy='force' name='3dnowext'/>
-  <feature policy='force' name='svm'/>
-  <feature policy='forbid' name='popcnt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+guest.xml b/tests/cputestdata/x86-host+guest.xml
deleted file mode 100644 (file)
index 137a3d6..0000000
--- a/tests/cputestdata/x86-host+guest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='disable' name='sse4.2'/>
-  <feature policy='disable' name='3dnow'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='disable' name='vmx'/>
-  <feature policy='disable' name='ds_cpl'/>
-  <feature policy='disable' name='sse'/>
-  <feature policy='force' name='monitor'/>
-  <feature policy='force' name='pbe'/>
-  <feature policy='force' name='3dnowext'/>
-  <feature policy='force' name='svm'/>
-  <feature policy='forbid' name='popcnt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+host+host-model,models-result.xml b/tests/cputestdata/x86-host+host+host-model,models-result.xml
deleted file mode 100644 (file)
index 4be4701..0000000
--- a/tests/cputestdata/x86-host+host+host-model,models-result.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>core2duo</model>
-  <vendor>Intel</vendor>
-  <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='lahf_lm'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+host-model-nofallback.xml b/tests/cputestdata/x86-host+host-model-nofallback.xml
deleted file mode 100644 (file)
index 0c3ede0..0000000
--- a/tests/cputestdata/x86-host+host-model-nofallback.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Penryn</model>
-  <vendor>Intel</vendor>
-  <topology sockets='1' cores='2' threads='1'/>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+host-model.xml b/tests/cputestdata/x86-host+host-model.xml
deleted file mode 100644 (file)
index a284767..0000000
--- a/tests/cputestdata/x86-host+host-model.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Penryn</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+host-passthrough-features.xml b/tests/cputestdata/x86-host+host-passthrough-features.xml
deleted file mode 100644 (file)
index dc2b775..0000000
--- a/tests/cputestdata/x86-host+host-passthrough-features.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='host-passthrough'>
-  <feature policy='disable' name='dca'/>
-  <feature policy='force' name='vmx'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+host-passthrough.xml b/tests/cputestdata/x86-host+host-passthrough.xml
deleted file mode 100644 (file)
index 655c7a7..0000000
--- a/tests/cputestdata/x86-host+host-passthrough.xml
+++ /dev/null
@@ -1 +0,0 @@
-<cpu mode='host-passthrough'/>

diff --git a/tests/cputestdata/x86-host+min.xml b/tests/cputestdata/x86-host+min.xml
deleted file mode 100644 (file)
index 8101151..0000000
--- a/tests/cputestdata/x86-host+min.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Penryn</model>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+penryn-force-result.xml b/tests/cputestdata/x86-host+penryn-force-result.xml
deleted file mode 100644 (file)
index bb624c0..0000000
--- a/tests/cputestdata/x86-host+penryn-force-result.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Penryn</model>
-  <feature policy='force' name='popcnt'/>
-  <feature policy='force' name='sse4.2'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+pentium3.xml b/tests/cputestdata/x86-host+pentium3.xml
deleted file mode 100644 (file)
index 8101151..0000000
--- a/tests/cputestdata/x86-host+pentium3.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Penryn</model>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host+strict-force-extra-result.xml b/tests/cputestdata/x86-host+strict-force-extra-result.xml
deleted file mode 100644 (file)
index 74b3327..0000000
--- a/tests/cputestdata/x86-host+strict-force-extra-result.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpu mode='custom' match='strict'>
-  <model fallback='allow'>Penryn</model>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='vme'/>
-  <feature policy='force' name='3dnow'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml
deleted file mode 100644 (file)
index 2dbe06c..0000000
--- a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Haswell</model>
-  <topology sockets='1' cores='2' threads='2'/>
-  <feature policy='disable' name='rtm'/>
-  <feature policy='disable' name='hle'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
deleted file mode 100644 (file)
index 5d149bb..0000000
--- a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Haswell</model>
-  <topology sockets='1' cores='2' threads='2'/>
-  <feature policy='disable' name='hle'/>
-  <feature policy='disable' name='rtm'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml
deleted file mode 100644 (file)
index 3b74089..0000000
--- a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Haswell-noTSX</model>
-  <topology sockets='1' cores='2' threads='2'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-Haswell-noTSX.xml b/tests/cputestdata/x86-host-Haswell-noTSX.xml
deleted file mode 100644 (file)
index c003085..0000000
--- a/tests/cputestdata/x86-host-Haswell-noTSX.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
-  <vendor>Intel</vendor>
-  <topology sockets='1' cores='2' threads='2'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-SandyBridge.xml b/tests/cputestdata/x86-host-SandyBridge.xml
deleted file mode 100644 (file)
index 7f26b7b..0000000
--- a/tests/cputestdata/x86-host-SandyBridge.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <topology sockets='1' cores='2' threads='2'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-amd-fake.xml b/tests/cputestdata/x86-host-amd-fake.xml
deleted file mode 100644 (file)
index c81990a..0000000
--- a/tests/cputestdata/x86-host-amd-fake.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <vendor>AMD</vendor>
-  <topology sockets='1' cores='4' threads='1'/>
-  <feature name='dca'/>
-  <feature name='xtpr'/>
-  <feature name='tm2'/>
-  <feature name='est'/>
-  <feature name='vmx'/>
-  <feature name='ds_cpl'/>
-  <feature name='monitor'/>
-  <feature name='pbe'/>
-  <feature name='tm'/>
-  <feature name='ht'/>
-  <feature name='ss'/>
-  <feature name='acpi'/>
-  <feature name='ds'/>
-  <feature name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-amd.xml b/tests/cputestdata/x86-host-amd.xml
deleted file mode 100644 (file)
index e662829..0000000
--- a/tests/cputestdata/x86-host-amd.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Opteron_G3</model>
-  <vendor>AMD</vendor>
-  <topology sockets='8' cores='1' threads='1'/>
-  <feature name='osvw'/>
-  <feature name='3dnowprefetch'/>
-  <feature name='cr8legacy'/>
-  <feature name='extapic'/>
-  <feature name='cmp_legacy'/>
-  <feature name='3dnow'/>
-  <feature name='3dnowext'/>
-  <feature name='pdpe1gb'/>
-  <feature name='fxsr_opt'/>
-  <feature name='mmxext'/>
-  <feature name='ht'/>
-  <feature name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-better+pentium3-result.xml b/tests/cputestdata/x86-host-better+pentium3-result.xml
deleted file mode 100644 (file)
index 9d4f98f..0000000
--- a/tests/cputestdata/x86-host-better+pentium3-result.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Nehalem</model>
-  <feature policy='require' name='dca'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-better.xml b/tests/cputestdata/x86-host-better.xml
deleted file mode 100644 (file)
index 8340f11..0000000
--- a/tests/cputestdata/x86-host-better.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Nehalem</model>
-  <vendor>Intel</vendor>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature name='dca'/>
-  <feature name='xtpr'/>
-  <feature name='tm2'/>
-  <feature name='est'/>
-  <feature name='vmx'/>
-  <feature name='ds_cpl'/>
-  <feature name='monitor'/>
-  <feature name='pbe'/>
-  <feature name='tm'/>
-  <feature name='ht'/>
-  <feature name='ss'/>
-  <feature name='acpi'/>
-  <feature name='ds'/>
-  <feature name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-incomp-arch.xml b/tests/cputestdata/x86-host-incomp-arch.xml
deleted file mode 100644 (file)
index f7c064e..0000000
--- a/tests/cputestdata/x86-host-incomp-arch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cpu>
-  <arch>ia64</arch>
-  <model>Penryn</model>
-  <vendor>Intel</vendor>
-  <topology sockets='1' cores='4' threads='1'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-invtsc+host-model.xml b/tests/cputestdata/x86-host-invtsc+host-model.xml
deleted file mode 100644 (file)
index 998ed23..0000000
--- a/tests/cputestdata/x86-host-invtsc+host-model.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <feature policy='require' name='osxsave'/>
-  <feature policy='require' name='pcid'/>
-  <feature policy='require' name='pdcm'/>
-  <feature policy='require' name='xtpr'/>
-  <feature policy='require' name='tm2'/>
-  <feature policy='require' name='est'/>
-  <feature policy='require' name='smx'/>
-  <feature policy='require' name='vmx'/>
-  <feature policy='require' name='ds_cpl'/>
-  <feature policy='require' name='monitor'/>
-  <feature policy='require' name='dtes64'/>
-  <feature policy='require' name='pbe'/>
-  <feature policy='require' name='tm'/>
-  <feature policy='require' name='ht'/>
-  <feature policy='require' name='ss'/>
-  <feature policy='require' name='acpi'/>
-  <feature policy='require' name='ds'/>
-  <feature policy='require' name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-invtsc.xml b/tests/cputestdata/x86-host-invtsc.xml
deleted file mode 100644 (file)
index f558399..0000000
--- a/tests/cputestdata/x86-host-invtsc.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>SandyBridge</model>
-  <vendor>Intel</vendor>
-  <topology sockets='1' cores='2' threads='2'/>
-  <feature name='invtsc'/>
-  <feature name='osxsave'/>
-  <feature name='pcid'/>
-  <feature name='pdcm'/>
-  <feature name='xtpr'/>
-  <feature name='tm2'/>
-  <feature name='est'/>
-  <feature name='smx'/>
-  <feature name='vmx'/>
-  <feature name='ds_cpl'/>
-  <feature name='monitor'/>
-  <feature name='dtes64'/>
-  <feature name='pbe'/>
-  <feature name='tm'/>
-  <feature name='ht'/>
-  <feature name='ss'/>
-  <feature name='acpi'/>
-  <feature name='ds'/>
-  <feature name='vme'/>
-  <pages unit='KiB' size='4'/>
-  <pages unit='KiB' size='2048'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-model-nofallback.xml b/tests/cputestdata/x86-host-model-nofallback.xml
deleted file mode 100644 (file)
index 4e42eb4..0000000
--- a/tests/cputestdata/x86-host-model-nofallback.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='host-model'>
-  <model fallback='forbid'/>
-  <topology sockets='1' cores='2' threads='1'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-model.xml b/tests/cputestdata/x86-host-model.xml
deleted file mode 100644 (file)
index fd50c03..0000000
--- a/tests/cputestdata/x86-host-model.xml
+++ /dev/null
@@ -1 +0,0 @@
-<cpu mode='host-model'/>

diff --git a/tests/cputestdata/x86-host-no-vendor.xml b/tests/cputestdata/x86-host-no-vendor.xml
deleted file mode 100644 (file)
index efb0a44..0000000
--- a/tests/cputestdata/x86-host-no-vendor.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature name='dca'/>
-  <feature name='xtpr'/>
-  <feature name='tm2'/>
-  <feature name='est'/>
-  <feature name='vmx'/>
-  <feature name='ds_cpl'/>
-  <feature name='monitor'/>
-  <feature name='pbe'/>
-  <feature name='tm'/>
-  <feature name='ht'/>
-  <feature name='ss'/>
-  <feature name='acpi'/>
-  <feature name='ds'/>
-  <feature name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-passthrough-features.xml b/tests/cputestdata/x86-host-passthrough-features.xml
deleted file mode 100644 (file)
index dc2b775..0000000
--- a/tests/cputestdata/x86-host-passthrough-features.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='host-passthrough'>
-  <feature policy='disable' name='dca'/>
-  <feature policy='force' name='vmx'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-passthrough.xml b/tests/cputestdata/x86-host-passthrough.xml
deleted file mode 100644 (file)
index 655c7a7..0000000
--- a/tests/cputestdata/x86-host-passthrough.xml
+++ /dev/null
@@ -1 +0,0 @@
-<cpu mode='host-passthrough'/>

diff --git a/tests/cputestdata/x86-host-worse+guest-result.xml b/tests/cputestdata/x86-host-worse+guest-result.xml
deleted file mode 100644 (file)
index 2edc875..0000000
--- a/tests/cputestdata/x86-host-worse+guest-result.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <model fallback='allow'>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature policy='disable' name='dca'/>
-  <feature policy='disable' name='xtpr'/>
-  <feature policy='disable' name='sse4.2'/>
-  <feature policy='disable' name='3dnow'/>
-  <feature policy='require' name='ssse3'/>
-  <feature policy='disable' name='vmx'/>
-  <feature policy='disable' name='ds_cpl'/>
-  <feature policy='disable' name='sse'/>
-  <feature policy='force' name='monitor'/>
-  <feature policy='force' name='pbe'/>
-  <feature policy='force' name='3dnowext'/>
-  <feature policy='force' name='svm'/>
-  <feature policy='forbid' name='popcnt'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host-worse.xml b/tests/cputestdata/x86-host-worse.xml
deleted file mode 100644 (file)
index dcf4670..0000000
--- a/tests/cputestdata/x86-host-worse.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <vendor>Intel</vendor>
-  <topology sockets='2' cores='4' threads='1'/>
-</cpu>

diff --git a/tests/cputestdata/x86-host.xml b/tests/cputestdata/x86-host.xml
deleted file mode 100644 (file)
index f1c163d..0000000
--- a/tests/cputestdata/x86-host.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<cpu>
-  <arch>x86_64</arch>
-  <model>Penryn</model>
-  <vendor>Intel</vendor>
-  <topology sockets='2' cores='4' threads='1'/>
-  <feature name='dca'/>
-  <feature name='xtpr'/>
-  <feature name='tm2'/>
-  <feature name='est'/>
-  <feature name='vmx'/>
-  <feature name='ds_cpl'/>
-  <feature name='monitor'/>
-  <feature name='pbe'/>
-  <feature name='tm'/>
-  <feature name='ht'/>
-  <feature name='ss'/>
-  <feature name='acpi'/>
-  <feature name='ds'/>
-  <feature name='vme'/>
-</cpu>

diff --git a/tests/cputestdata/x86-min.xml b/tests/cputestdata/x86-min.xml
deleted file mode 100644 (file)
index 795645d..0000000
--- a/tests/cputestdata/x86-min.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu match='minimum'>
-  <model>Penryn</model>
-</cpu>

diff --git a/tests/cputestdata/x86-penryn-force.xml b/tests/cputestdata/x86-penryn-force.xml
deleted file mode 100644 (file)
index 12fd274..0000000
--- a/tests/cputestdata/x86-penryn-force.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='popcnt' policy='force'/>
-  <feature name='sse4.2' policy='force'/>
-</cpu>

diff --git a/tests/cputestdata/x86-pentium3-amd.xml b/tests/cputestdata/x86-pentium3-amd.xml
deleted file mode 100644 (file)
index 5fd73e4..0000000
--- a/tests/cputestdata/x86-pentium3-amd.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu match='exact'>
-  <model>pentium3</model>
-  <vendor>AMD</vendor>
-</cpu>

diff --git a/tests/cputestdata/x86-pentium3.xml b/tests/cputestdata/x86-pentium3.xml
deleted file mode 100644 (file)
index 187e83d..0000000
--- a/tests/cputestdata/x86-pentium3.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu match='minimum'>
-  <model>pentium3</model>
-</cpu>

diff --git a/tests/cputestdata/x86-strict-disable.xml b/tests/cputestdata/x86-strict-disable.xml
deleted file mode 100644 (file)
index f2bac1a..0000000
--- a/tests/cputestdata/x86-strict-disable.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpu match='strict'>
-  <model>Penryn</model>
-  <feature name='dca' policy='require'/>
-  <feature name='xtpr' policy='require'/>
-  <feature name='tm2' policy='require'/>
-  <feature name='est' policy='require'/>
-  <feature name='vmx' policy='require'/>
-  <feature name='ds_cpl' policy='require'/>
-  <feature name='monitor' policy='disable'/>
-  <feature name='pbe' policy='require'/>
-  <feature name='tm' policy='require'/>
-  <feature name='ht' policy='require'/>
-  <feature name='ss' policy='disable'/>
-  <feature name='acpi' policy='require'/>
-  <feature name='ds' policy='require'/>
-  <feature name='vme' policy='require'/>
-  <feature name='3dnow' policy='disable'/>
-</cpu>

diff --git a/tests/cputestdata/x86-strict-force-extra.xml b/tests/cputestdata/x86-strict-force-extra.xml
deleted file mode 100644 (file)
index dbae38c..0000000
--- a/tests/cputestdata/x86-strict-force-extra.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<cpu match='strict'>
-  <model>Penryn</model>
-  <feature name='dca' policy='require'/>
-  <feature name='xtpr' policy='require'/>
-  <feature name='tm2' policy='require'/>
-  <feature name='est' policy='require'/>
-  <feature name='vmx' policy='require'/>
-  <feature name='ds_cpl' policy='require'/>
-  <feature name='monitor' policy='require'/>
-  <feature name='pbe' policy='require'/>
-  <feature name='tm' policy='require'/>
-  <feature name='ht' policy='require'/>
-  <feature name='ss' policy='require'/>
-  <feature name='acpi' policy='require'/>
-  <feature name='ds' policy='require'/>
-  <feature name='vme' policy='require'/>
-  <feature name='3dnow' policy='force'/>
-</cpu>

diff --git a/tests/cputestdata/x86-strict-full.xml b/tests/cputestdata/x86-strict-full.xml
deleted file mode 100644 (file)
index 2dbe250..0000000
--- a/tests/cputestdata/x86-strict-full.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<cpu match='strict'>
-  <model>Penryn</model>
-  <feature name='dca' policy='require'/>
-  <feature name='xtpr' policy='require'/>
-  <feature name='tm2' policy='require'/>
-  <feature name='est' policy='require'/>
-  <feature name='vmx' policy='require'/>
-  <feature name='ds_cpl' policy='require'/>
-  <feature name='monitor' policy='require'/>
-  <feature name='pbe' policy='require'/>
-  <feature name='tm' policy='require'/>
-  <feature name='ht' policy='require'/>
-  <feature name='ss' policy='require'/>
-  <feature name='acpi' policy='require'/>
-  <feature name='ds' policy='require'/>
-  <feature name='vme' policy='require'/>
-</cpu>

diff --git a/tests/cputestdata/x86-strict.xml b/tests/cputestdata/x86-strict.xml
deleted file mode 100644 (file)
index a64c262..0000000
--- a/tests/cputestdata/x86-strict.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cpu match='strict'>
-  <model>Penryn</model>
-</cpu>

diff --git a/tests/cputestdata/x86_64-Haswell-noTSX-nofallback.xml b/tests/cputestdata/x86_64-Haswell-noTSX-nofallback.xml
new file mode 100644 (file)
index 0000000..c23c3f3
--- /dev/null
+++ b/tests/cputestdata/x86_64-Haswell-noTSX-nofallback.xml
@@ -0,0 +1,4 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Haswell-noTSX</model>
+  <topology sockets='1' cores='2' threads='2'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-Haswell-noTSX.xml b/tests/cputestdata/x86_64-Haswell-noTSX.xml
new file mode 100644 (file)
index 0000000..3b74089
--- /dev/null
+++ b/tests/cputestdata/x86_64-Haswell-noTSX.xml
@@ -0,0 +1,4 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Haswell-noTSX</model>
+  <topology sockets='1' cores='2' threads='2'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-Haswell.xml b/tests/cputestdata/x86_64-Haswell.xml
new file mode 100644 (file)
index 0000000..630cb99
--- /dev/null
+++ b/tests/cputestdata/x86_64-Haswell.xml
@@ -0,0 +1,6 @@
+<cpu match='exact'>
+  <model fallback='allow'>Haswell</model>
+  <topology sockets='1' cores='2' threads='2'/>
+  <feature name='rtm' policy='disable'/>
+  <feature name='hle' policy='disable'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-1-result.xml b/tests/cputestdata/x86_64-baseline-1-result.xml
new file mode 100644 (file)
index 0000000..96c4f43
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-1-result.xml
@@ -0,0 +1,5 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Conroe</model>
+  <vendor>Intel</vendor>
+  <feature policy='disable' name='lahf_lm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-1.xml b/tests/cputestdata/x86_64-baseline-1.xml
new file mode 100644 (file)
index 0000000..509e6a8
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-1.xml
@@ -0,0 +1,20 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <topology sockets='2' cores='4' threads='1'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Conroe</model>
+  <vendor>Intel</vendor>
+  <topology sockets='1' cores='1' threads='1'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>core2duo</model>
+  <vendor>Intel</vendor>
+  <topology sockets='1' cores='1' threads='1'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-2-result.xml b/tests/cputestdata/x86_64-baseline-2-result.xml
new file mode 100644 (file)
index 0000000..a11352d
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-2-result.xml
@@ -0,0 +1,4 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>core2duo</model>
+  <feature policy='disable' name='nx'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-2.xml b/tests/cputestdata/x86_64-baseline-2.xml
new file mode 100644 (file)
index 0000000..055223f
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-2.xml
@@ -0,0 +1,22 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>core2duo</model>
+  <topology sockets='1' cores='2' threads='1'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>pentiumpro</model>
+  <topology sockets='1' cores='2' threads='1'/>
+  <feature name='mtrr'/>
+  <feature name='clflush'/>
+  <feature name='mca'/>
+  <feature name='vme'/>
+  <feature name='pse36'/>
+  <feature name='pni'/>
+  <feature name='monitor'/>
+  <feature name='ssse3'/>
+  <feature name='lm'/>
+  <feature name='syscall'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-3-expanded.xml b/tests/cputestdata/x86_64-baseline-3-expanded.xml
new file mode 100644 (file)
index 0000000..f0c2273
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-3-expanded.xml
@@ -0,0 +1,35 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+  <feature policy='require' name='fpu'/>
+  <feature policy='require' name='de'/>
+  <feature policy='require' name='pse'/>
+  <feature policy='require' name='tsc'/>
+  <feature policy='require' name='msr'/>
+  <feature policy='require' name='pae'/>
+  <feature policy='require' name='mce'/>
+  <feature policy='require' name='cx8'/>
+  <feature policy='require' name='apic'/>
+  <feature policy='require' name='sep'/>
+  <feature policy='require' name='mtrr'/>
+  <feature policy='require' name='pge'/>
+  <feature policy='require' name='mca'/>
+  <feature policy='require' name='cmov'/>
+  <feature policy='require' name='pat'/>
+  <feature policy='require' name='pse36'/>
+  <feature policy='require' name='clflush'/>
+  <feature policy='require' name='mmx'/>
+  <feature policy='require' name='fxsr'/>
+  <feature policy='require' name='sse'/>
+  <feature policy='require' name='sse2'/>
+  <feature policy='require' name='pni'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='sse4.1'/>
+  <feature policy='require' name='sse4.2'/>
+  <feature policy='require' name='popcnt'/>
+  <feature policy='require' name='aes'/>
+  <feature policy='require' name='syscall'/>
+  <feature policy='require' name='nx'/>
+  <feature policy='require' name='lm'/>
+  <feature policy='require' name='lahf_lm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-3-result.xml b/tests/cputestdata/x86_64-baseline-3-result.xml
new file mode 100644 (file)
index 0000000..7349831
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-3-result.xml
@@ -0,0 +1,3 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-3.xml b/tests/cputestdata/x86_64-baseline-3.xml
new file mode 100644 (file)
index 0000000..7654a1d
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-3.xml
@@ -0,0 +1,7 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <topology sockets='1' cores='2' threads='1'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-4-expanded.xml b/tests/cputestdata/x86_64-baseline-4-expanded.xml
new file mode 100644 (file)
index 0000000..7e4578e
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-4-expanded.xml
@@ -0,0 +1,46 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pclmuldq'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='xsave'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='avx'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='fpu'/>
+  <feature policy='require' name='de'/>
+  <feature policy='require' name='pse'/>
+  <feature policy='require' name='tsc'/>
+  <feature policy='require' name='msr'/>
+  <feature policy='require' name='pae'/>
+  <feature policy='require' name='mce'/>
+  <feature policy='require' name='cx8'/>
+  <feature policy='require' name='apic'/>
+  <feature policy='require' name='sep'/>
+  <feature policy='require' name='mtrr'/>
+  <feature policy='require' name='pge'/>
+  <feature policy='require' name='mca'/>
+  <feature policy='require' name='cmov'/>
+  <feature policy='require' name='pat'/>
+  <feature policy='require' name='pse36'/>
+  <feature policy='require' name='clflush'/>
+  <feature policy='require' name='mmx'/>
+  <feature policy='require' name='fxsr'/>
+  <feature policy='require' name='sse'/>
+  <feature policy='require' name='sse2'/>
+  <feature policy='require' name='pni'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='sse4.1'/>
+  <feature policy='require' name='sse4.2'/>
+  <feature policy='require' name='popcnt'/>
+  <feature policy='require' name='aes'/>
+  <feature policy='require' name='syscall'/>
+  <feature policy='require' name='nx'/>
+  <feature policy='require' name='lm'/>
+  <feature policy='require' name='lahf_lm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-4-result.xml b/tests/cputestdata/x86_64-baseline-4-result.xml
new file mode 100644 (file)
index 0000000..1461a5b
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-4-result.xml
@@ -0,0 +1,14 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Westmere</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pclmuldq'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='xsave'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='avx'/>
+  <feature policy='require' name='hypervisor'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-4.xml b/tests/cputestdata/x86_64-baseline-4.xml
new file mode 100644 (file)
index 0000000..7f5ae16
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-4.xml
@@ -0,0 +1,18 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-5-expanded.xml b/tests/cputestdata/x86_64-baseline-5-expanded.xml
new file mode 100644 (file)
index 0000000..daef2a7
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-5-expanded.xml
@@ -0,0 +1,47 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='disable' name='rdtscp'/>
+  <feature policy='require' name='fpu'/>
+  <feature policy='require' name='de'/>
+  <feature policy='require' name='pse'/>
+  <feature policy='require' name='tsc'/>
+  <feature policy='require' name='msr'/>
+  <feature policy='require' name='pae'/>
+  <feature policy='require' name='mce'/>
+  <feature policy='require' name='cx8'/>
+  <feature policy='require' name='apic'/>
+  <feature policy='require' name='sep'/>
+  <feature policy='require' name='mtrr'/>
+  <feature policy='require' name='pge'/>
+  <feature policy='require' name='mca'/>
+  <feature policy='require' name='cmov'/>
+  <feature policy='require' name='pat'/>
+  <feature policy='require' name='pse36'/>
+  <feature policy='require' name='clflush'/>
+  <feature policy='require' name='mmx'/>
+  <feature policy='require' name='fxsr'/>
+  <feature policy='require' name='sse'/>
+  <feature policy='require' name='sse2'/>
+  <feature policy='require' name='pni'/>
+  <feature policy='require' name='pclmuldq'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='sse4.1'/>
+  <feature policy='require' name='sse4.2'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='popcnt'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='aes'/>
+  <feature policy='require' name='xsave'/>
+  <feature policy='require' name='avx'/>
+  <feature policy='require' name='syscall'/>
+  <feature policy='require' name='nx'/>
+  <feature policy='require' name='lm'/>
+  <feature policy='require' name='lahf_lm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-5-result.xml b/tests/cputestdata/x86_64-baseline-5-result.xml
new file mode 100644 (file)
index 0000000..775a27d
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-5-result.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='disable' name='rdtscp'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-5.xml b/tests/cputestdata/x86_64-baseline-5.xml
new file mode 100644 (file)
index 0000000..80cd533
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-5.xml
@@ -0,0 +1,35 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Nehalem</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='aes'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-6-migratable.xml b/tests/cputestdata/x86_64-baseline-6-migratable.xml
new file mode 100644 (file)
index 0000000..775a27d
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-6-migratable.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='disable' name='rdtscp'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-6-result.xml b/tests/cputestdata/x86_64-baseline-6-result.xml
new file mode 100644 (file)
index 0000000..cafca97
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-6-result.xml
@@ -0,0 +1,11 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='invtsc'/>
+  <feature policy='disable' name='rdtscp'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-6.xml b/tests/cputestdata/x86_64-baseline-6.xml
new file mode 100644 (file)
index 0000000..9845b93
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-6.xml
@@ -0,0 +1,37 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+  <feature name='invtsc'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Nehalem</model>
+  <vendor>Intel</vendor>
+  <topology sockets='4' cores='1' threads='1'/>
+  <feature name='aes'/>
+  <feature name='hypervisor'/>
+  <feature name='avx'/>
+  <feature name='osxsave'/>
+  <feature name='xsave'/>
+  <feature name='tsc-deadline'/>
+  <feature name='x2apic'/>
+  <feature name='pcid'/>
+  <feature name='pclmuldq'/>
+  <feature name='ss'/>
+  <feature name='vme'/>
+  <feature name='invtsc'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-7-result.xml b/tests/cputestdata/x86_64-baseline-7-result.xml
new file mode 100644 (file)
index 0000000..2af549e
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-7-result.xml
@@ -0,0 +1,4 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-7.xml b/tests/cputestdata/x86_64-baseline-7.xml
new file mode 100644 (file)
index 0000000..b7e61b1
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-7.xml
@@ -0,0 +1,24 @@
+<cpuTest>
+    <cpu>
+      <arch>x86_64</arch>
+      <model>SandyBridge</model>
+      <vendor>Intel</vendor>
+      <topology sockets='1' cores='2' threads='2'/>
+      <feature name='invpcid'/>
+      <feature name='erms'/>
+      <feature name='bmi2'/>
+      <feature name='smep'/>
+      <feature name='avx2'/>
+      <feature name='bmi1'/>
+      <feature name='fsgsbase'/>
+      <feature name='movbe'/>
+      <feature name='pcid'/>
+      <feature name='fma'/>
+    </cpu>
+    <cpu>
+      <arch>x86_64</arch>
+      <model>Haswell-noTSX</model>
+      <vendor>Intel</vendor>
+      <topology sockets='1' cores='2' threads='2'/>
+    </cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-8-result.xml b/tests/cputestdata/x86_64-baseline-8-result.xml
new file mode 100644 (file)
index 0000000..88226b3
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-8-result.xml
@@ -0,0 +1,4 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Broadwell-noTSX</model>
+  <vendor>Intel</vendor>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-8.xml b/tests/cputestdata/x86_64-baseline-8.xml
new file mode 100644 (file)
index 0000000..f1ee67d
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-8.xml
@@ -0,0 +1,28 @@
+<cpuTest>
+    <cpu>
+      <arch>x86_64</arch>
+      <model>SandyBridge</model>
+      <vendor>Intel</vendor>
+      <topology sockets='1' cores='2' threads='2'/>
+      <feature name='invpcid'/>
+      <feature name='erms'/>
+      <feature name='bmi2'/>
+      <feature name='smep'/>
+      <feature name='avx2'/>
+      <feature name='bmi1'/>
+      <feature name='fsgsbase'/>
+      <feature name='movbe'/>
+      <feature name='pcid'/>
+      <feature name='fma'/>
+      <feature name='3dnowprefetch'/>
+      <feature name='rdseed'/>
+      <feature name='adx'/>
+      <feature name='smap'/>
+    </cpu>
+    <cpu>
+      <arch>x86_64</arch>
+      <model>Broadwell-noTSX</model>
+      <vendor>Intel</vendor>
+      <topology sockets='1' cores='2' threads='2'/>
+    </cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-incompatible-vendors.xml b/tests/cputestdata/x86_64-baseline-incompatible-vendors.xml
new file mode 100644 (file)
index 0000000..ead1fbf
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-incompatible-vendors.xml
@@ -0,0 +1,14 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <topology sockets='2' cores='4' threads='1'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <topology sockets='1' cores='1' threads='1'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-no-vendor-result.xml b/tests/cputestdata/x86_64-baseline-no-vendor-result.xml
new file mode 100644 (file)
index 0000000..00e03b2
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-no-vendor-result.xml
@@ -0,0 +1,3 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>cpu64-rhel6</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-no-vendor.xml b/tests/cputestdata/x86_64-baseline-no-vendor.xml
new file mode 100644 (file)
index 0000000..84605a4
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-no-vendor.xml
@@ -0,0 +1,12 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <topology sockets='2' cores='4' threads='1'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G3</model>
+  <topology sockets='1' cores='1' threads='1'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-baseline-some-vendors-result.xml b/tests/cputestdata/x86_64-baseline-some-vendors-result.xml
new file mode 100644 (file)
index 0000000..2927611
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-some-vendors-result.xml
@@ -0,0 +1,3 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Opteron_G1</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-baseline-some-vendors.xml b/tests/cputestdata/x86_64-baseline-some-vendors.xml
new file mode 100644 (file)
index 0000000..816ed6b
--- /dev/null
+++ b/tests/cputestdata/x86_64-baseline-some-vendors.xml
@@ -0,0 +1,13 @@
+<cpuTest>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G1</model>
+  <topology sockets='2' cores='4' threads='1'/>
+</cpu>
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <topology sockets='1' cores='1' threads='1'/>
+</cpu>
+</cpuTest>

diff --git a/tests/cputestdata/x86_64-bogus-feature.xml b/tests/cputestdata/x86_64-bogus-feature.xml
new file mode 100644 (file)
index 0000000..5a11814
--- /dev/null
+++ b/tests/cputestdata/x86_64-bogus-feature.xml
@@ -0,0 +1,4 @@
+<cpu match='minimum'>
+  <model>Penryn</model>
+  <feature name='bogus' policy='optional'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-bogus-model.xml b/tests/cputestdata/x86_64-bogus-model.xml
new file mode 100644 (file)
index 0000000..f39392f
--- /dev/null
+++ b/tests/cputestdata/x86_64-bogus-model.xml
@@ -0,0 +1,3 @@
+<cpu match='minimum'>
+  <model>Bogus</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-bogus-vendor.xml b/tests/cputestdata/x86_64-bogus-vendor.xml
new file mode 100644 (file)
index 0000000..2ffdefe
--- /dev/null
+++ b/tests/cputestdata/x86_64-bogus-vendor.xml
@@ -0,0 +1,4 @@
+<cpu match='minimum'>
+  <model>Penryn</model>
+  <vendor>Bogus</vendor>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
new file mode 100644 (file)
index 0000000..dacf1d0
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
@@ -0,0 +1,26 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G5</model>
+  <vendor>AMD</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='bmi1'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='extapic'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='require' name='ibs'/>
+  <feature policy='require' name='skinit'/>
+  <feature policy='require' name='wdt'/>
+  <feature policy='require' name='lwp'/>
+  <feature policy='require' name='tce'/>
+  <feature policy='require' name='nodeid_msr'/>
+  <feature policy='require' name='topoext'/>
+  <feature policy='require' name='perfctr_core'/>
+  <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
new file mode 100644 (file)
index 0000000..cb90c96
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -0,0 +1,26 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G5</model>
+  <vendor>AMD</vendor>
+  <feature name='vme'/>
+  <feature name='ht'/>
+  <feature name='monitor'/>
+  <feature name='osxsave'/>
+  <feature name='bmi1'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='cmp_legacy'/>
+  <feature name='extapic'/>
+  <feature name='cr8legacy'/>
+  <feature name='osvw'/>
+  <feature name='ibs'/>
+  <feature name='skinit'/>
+  <feature name='wdt'/>
+  <feature name='lwp'/>
+  <feature name='tce'/>
+  <feature name='nodeid_msr'/>
+  <feature name='topoext'/>
+  <feature name='perfctr_core'/>
+  <feature name='perfctr_nb'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
new file mode 100644 (file)
index 0000000..7a38f0f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
@@ -0,0 +1,16 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G5</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='bmi1'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='disable' name='rdtscp'/>
+  <feature policy='disable' name='svm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K.json b/tests/cputestdata/x86_64-cpuid-A10-5800K.json
new file mode 100644 (file)
index 0000000..53b39ad
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 9
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 2165747
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 642779136
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 10
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 3065524739
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 126614527
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 21,
+  "id": "family"
+}
+
+{
+  "return": 16,
+  "id": "model"
+}
+
+{
+  "return": 1,
+  "id": "stepping"
+}
+
+{
+  "return": "AMD A10-5800K APU with Radeon(tm) HD Graphics  ",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K.xml
new file mode 100644 (file)
index 0000000..2889056
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K.xml
@@ -0,0 +1,50 @@
+<!-- AMD A10-5800K APU with Radeon(tm) HD Graphics -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00610f01' ebx='0x00040800' ecx='0x3e98320b' edx='0x178bfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000008' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00610f01' ebx='0x20000000' ecx='0x01ebbfff' edx='0x2fd3fbff'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x2d303141' ecx='0x30303835' edx='0x5041204b'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x69772055' ebx='0x52206874' ecx='0x6f656461' edx='0x6d74286e'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x44482029' ebx='0x61724720' ecx='0x63696870' edx='0x00202073'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff40ff18' ebx='0xff40ff30' ecx='0x10040140' edx='0x40020140'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64006400' ebx='0x64004200' ecx='0x08008140' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000007d9'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00004003' edx='0x00000000'/>
+  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x00001cff'/>
+  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf040f018' ebx='0x64006400' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
+  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000010' ebx='0x00000100' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
new file mode 100644 (file)
index 0000000..5e9efc7
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
@@ -0,0 +1,20 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>core2duo</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='movbe'/>
+  <feature policy='require' name='lahf_lm'/>
+  <feature policy='disable' name='syscall'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
new file mode 100644 (file)
index 0000000..8cf4341
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
@@ -0,0 +1,21 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>n270</model>
+  <vendor>Intel</vendor>
+  <feature name='pse36'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='ds_cpl'/>
+  <feature name='tm2'/>
+  <feature name='cx16'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='movbe'/>
+  <feature name='lm'/>
+  <feature name='lahf_lm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510.xml
new file mode 100644 (file)
index 0000000..b5aed8e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510.xml
@@ -0,0 +1,27 @@
+<!-- Intel(R) Atom(TM) CPU D510   @ 1.66GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000106ca' ebx='0x00040800' ecx='0x0040e31d' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x4fba5901' ebx='0x0e3080c0' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x04004121' ebx='0x0140003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x04004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x04004143' ebx='0x01c0003f' ecx='0x000003ff' edx='0x00000001'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000010'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100000'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x746e4920' edx='0x52286c65'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x74412029' ebx='0x54286d6f' ecx='0x4320294d' edx='0x44205550'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20303135' ebx='0x20402020' ecx='0x36362e31' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x02006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
new file mode 100644 (file)
index 0000000..be11b88
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
@@ -0,0 +1,21 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>core2duo</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='movbe'/>
+  <feature policy='require' name='lahf_lm'/>
+  <feature policy='disable' name='pse36'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
new file mode 100644 (file)
index 0000000..c79713d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
@@ -0,0 +1,22 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>n270</model>
+  <vendor>Intel</vendor>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='ds_cpl'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='cx16'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='movbe'/>
+  <feature name='syscall'/>
+  <feature name='lm'/>
+  <feature name='lahf_lm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450.xml
new file mode 100644 (file)
index 0000000..1852d67
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450.xml
@@ -0,0 +1,27 @@
+<!-- Intel(R) Atom(TM) CPU N450   @ 1.66GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000106ca' ebx='0x00020800' ecx='0x0040e39d' edx='0xbfe9fbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x4fba5901' ebx='0x0e3080c0' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x00004121' ebx='0x0140003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x00004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x00004143' ebx='0x01c0003f' ecx='0x000003ff' edx='0x00000001'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00020220'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x746e4920' edx='0x52286c65'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x74412029' ebx='0x54286d6f' ecx='0x4320294d' edx='0x4e205550'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20303534' ebx='0x20402020' ecx='0x36362e31' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x02006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003020' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280203' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
new file mode 100644 (file)
index 0000000..4c249eb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -0,0 +1,26 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
new file mode 100644 (file)
index 0000000..a604acb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -0,0 +1,26 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='osxsave'/>
+  <feature name='arat'/>
+  <feature name='xsaveopt'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
new file mode 100644 (file)
index 0000000..980cf74
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -0,0 +1,11 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
new file mode 100644 (file)
index 0000000..156b772
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
@@ -0,0 +1,88 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 6,
+      "features": 4
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 672139264
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 2
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2545558019
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 42,
+  "id": "model"
+}
+
+{
+  "return": 7,
+  "id": "stepping"
+}
+
+{
+  "return": "        Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.xml
new file mode 100644 (file)
index 0000000..0a33413
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x02100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b0ff' ecx='0x00000000' edx='0x00ca0000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300803' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000002'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000002'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x65746e49' edx='0x2952286c'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x726f4320' ebx='0x4d542865' ecx='0x35692029' edx='0x3035322d'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x50432030' ebx='0x20402055' ecx='0x30332e33' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
new file mode 100644 (file)
index 0000000..4c249eb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -0,0 +1,26 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
new file mode 100644 (file)
index 0000000..a604acb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -0,0 +1,26 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='osxsave'/>
+  <feature name='arat'/>
+  <feature name='xsaveopt'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
new file mode 100644 (file)
index 0000000..980cf74
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -0,0 +1,11 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
new file mode 100644 (file)
index 0000000..6dc2a80
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
@@ -0,0 +1,82 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 6,
+      "features": 4
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 672139264
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 2
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2545558019
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 42,
+  "id": "model"
+}
+
+{
+  "return": 7,
+  "id": "stepping"
+}
+
+{
+  "return": "       Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.xml
new file mode 100644 (file)
index 0000000..3802d7d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x03100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00000fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00021120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020' ecx='0x6c65746e' edx='0x20295228'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x65726f43' ebx='0x294d5428' ecx='0x2d356920' edx='0x30343532'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x5043204d' ebx='0x20402055' ecx='0x30362e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
new file mode 100644 (file)
index 0000000..9c93995
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -0,0 +1,29 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
new file mode 100644 (file)
index 0000000..b9f95ad
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -0,0 +1,29 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Haswell</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='osxsave'/>
+  <feature name='f16c'/>
+  <feature name='rdrand'/>
+  <feature name='arat'/>
+  <feature name='tsc_adjust'/>
+  <feature name='pdpe1gb'/>
+  <feature name='abm'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
new file mode 100644 (file)
index 0000000..c93688b
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
@@ -0,0 +1,14 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
new file mode 100644 (file)
index 0000000..e715ca0
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 33
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 4027
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4160369187
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 60,
+  "id": "model"
+}
+
+{
+  "return": 3,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Core(TM) i5-4670T CPU @ 2.30GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.xml
new file mode 100644 (file)
index 0000000..62960f9
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i5-4670T CPU @ 2.30GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306c3' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c10000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00042120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00002fbb' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300803' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x35692029' ebx='0x3736342d' ecx='0x43205430' edx='0x40205550'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x332e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
new file mode 100644 (file)
index 0000000..0ab5a7a
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -0,0 +1,26 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Skylake-Client</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='xsaves'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
new file mode 100644 (file)
index 0000000..c799394
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -0,0 +1,26 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Skylake-Client</model>
+  <vendor>Intel</vendor>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='osxsave'/>
+  <feature name='tsc_adjust'/>
+  <feature name='clflushopt'/>
+  <feature name='xsaves'/>
+  <feature name='pdpe1gb'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
new file mode 100644 (file)
index 0000000..171b482
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Skylake-Client</model>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='xsaves'/>
+  <feature policy='require' name='pdpe1gb'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
new file mode 100644 (file)
index 0000000..da296f9
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
@@ -0,0 +1,82 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 6,
+      "features": 4
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 15
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 289
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 10244027
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4160369155
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 94,
+  "id": "model"
+}
+
+{
+  "return": 3,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Core(TM) i5-6600 CPU @ 3.30GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.xml
new file mode 100644 (file)
index 0000000..cd0e63d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.xml
@@ -0,0 +1,46 @@
+<!-- Intel(R) Core(TM) i5-6600 CPU @ 3.30GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x06100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c30000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000007f7' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbb' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300804' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000006'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000006'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000114' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x35692029' ebx='0x3036362d' ecx='0x50432030' edx='0x20402055'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30332e33' ebx='0x007a4847' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
new file mode 100644 (file)
index 0000000..4c249eb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -0,0 +1,26 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
new file mode 100644 (file)
index 0000000..a604acb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -0,0 +1,26 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='osxsave'/>
+  <feature name='arat'/>
+  <feature name='xsaveopt'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
new file mode 100644 (file)
index 0000000..27d9f35
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
new file mode 100644 (file)
index 0000000..dd35449
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 672139264
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 2
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2545558019
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 42,
+  "id": "model"
+}
+
+{
+  "return": 7,
+  "id": "stepping"
+}
+
+{
+  "return": "        Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml
new file mode 100644 (file)
index 0000000..ad15597
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206a7' ebx='0x05100800' ecx='0x1fbae3ff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000005'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x65746e49' edx='0x2952286c'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x726f4320' ebx='0x4d542865' ecx='0x37692029' edx='0x3036322d'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x50432030' ebx='0x20402055' ecx='0x30342e33' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
new file mode 100644 (file)
index 0000000..776001f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -0,0 +1,25 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>IvyBridge</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
new file mode 100644 (file)
index 0000000..a23c651
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -0,0 +1,25 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>IvyBridge</model>
+  <vendor>Intel</vendor>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='osxsave'/>
+  <feature name='arat'/>
+  <feature name='xsaveopt'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M.xml
new file mode 100644 (file)
index 0000000..3010468
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i7-3520M CPU @ 2.90GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306a9' ebx='0x03100800' ecx='0x7fbae3ff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00021120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000281' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020' ecx='0x6c65746e' edx='0x20295228'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x65726f43' ebx='0x294d5428' ecx='0x2d376920' edx='0x30323533'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x5043204d' ebx='0x20402055' ecx='0x30392e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
new file mode 100644 (file)
index 0000000..90957e9
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -0,0 +1,24 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>IvyBridge</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
new file mode 100644 (file)
index 0000000..9fec131
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -0,0 +1,24 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>IvyBridge</model>
+  <vendor>Intel</vendor>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='osxsave'/>
+  <feature name='arat'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
new file mode 100644 (file)
index 0000000..9adeecc
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>IvyBridge</model>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
new file mode 100644 (file)
index 0000000..2b1349f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 672139264
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 643
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4156170787
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 58,
+  "id": "model"
+}
+
+{
+  "return": 9,
+  "id": "stepping"
+}
+
+{
+  "return": "      Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.xml
new file mode 100644 (file)
index 0000000..3c40d11
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306a9' ebx='0x03100800' ecx='0x7fbae3ff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00001fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00021120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000281' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x6e492020' ecx='0x286c6574' edx='0x43202952'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x2865726f' ebx='0x20294d54' ecx='0x332d3769' edx='0x51303437'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x5043204d' ebx='0x20402055' ecx='0x30372e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
new file mode 100644 (file)
index 0000000..776001f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -0,0 +1,25 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>IvyBridge</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
new file mode 100644 (file)
index 0000000..a23c651
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -0,0 +1,25 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>IvyBridge</model>
+  <vendor>Intel</vendor>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='osxsave'/>
+  <feature name='arat'/>
+  <feature name='xsaveopt'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
new file mode 100644 (file)
index 0000000..a70ae48
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -0,0 +1,9 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>IvyBridge</model>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
new file mode 100644 (file)
index 0000000..d83e778
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 672139264
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 643
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4156170755
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 58,
+  "id": "model"
+}
+
+{
+  "return": 9,
+  "id": "stepping"
+}
+
+{
+  "return": "        Intel(R) Core(TM) i7-3770 CPU @ 3.40GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.xml
new file mode 100644 (file)
index 0000000..ebdd50e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i7-3770 CPU @ 3.40GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306a9' ebx='0x05100800' ecx='0x7fbae3ff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000281' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000005'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x65746e49' edx='0x2952286c'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x726f4320' ebx='0x4d542865' ecx='0x37692029' edx='0x3737332d'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x50432030' ebx='0x20402055' ecx='0x30342e33' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
new file mode 100644 (file)
index 0000000..b2aac64
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -0,0 +1,30 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
new file mode 100644 (file)
index 0000000..fae8e8d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -0,0 +1,30 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='osxsave'/>
+  <feature name='f16c'/>
+  <feature name='rdrand'/>
+  <feature name='arat'/>
+  <feature name='tsc_adjust'/>
+  <feature name='xsaveopt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='abm'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
new file mode 100644 (file)
index 0000000..5fa3146
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
@@ -0,0 +1,15 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell-noTSX</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
new file mode 100644 (file)
index 0000000..2b15fad
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
@@ -0,0 +1,82 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 6,
+      "features": 4
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 33
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 1963
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4160369187
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 69,
+  "id": "model"
+}
+
+{
+  "return": 1,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.xml
new file mode 100644 (file)
index 0000000..4c0c259
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00040651' ebx='0x02100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c10000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000027ab' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000002'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036342d' ecx='0x43205530' edx='0x40205550'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x312e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
new file mode 100644 (file)
index 0000000..cd7b4bb
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -0,0 +1,30 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Broadwell</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
new file mode 100644 (file)
index 0000000..9b24941
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -0,0 +1,30 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Broadwell</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='osxsave'/>
+  <feature name='f16c'/>
+  <feature name='rdrand'/>
+  <feature name='arat'/>
+  <feature name='tsc_adjust'/>
+  <feature name='xsaveopt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='abm'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
new file mode 100644 (file)
index 0000000..1597971
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
@@ -0,0 +1,12 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Skylake-Client</model>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='disable' name='mpx'/>
+  <feature policy='disable' name='xsavec'/>
+  <feature policy='disable' name='xgetbv1'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
new file mode 100644 (file)
index 0000000..b570d46
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
@@ -0,0 +1,88 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 6,
+      "features": 4
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 289
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 1839035
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4160369187
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 61,
+  "id": "model"
+}
+
+{
+  "return": 4,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.xml
new file mode 100644 (file)
index 0000000..ecb4a6e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.xml
@@ -0,0 +1,41 @@
+<!-- Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000014' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306d4' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x021c2fbb' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036352d' ecx='0x43205530' edx='0x40205550'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x362e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
new file mode 100644 (file)
index 0000000..dfcbe24
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
@@ -0,0 +1,22 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Conroe</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
new file mode 100644 (file)
index 0000000..e7ddc39
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
@@ -0,0 +1,22 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Conroe</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='cx16'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
new file mode 100644 (file)
index 0000000..ddd7307
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
@@ -0,0 +1,11 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Penryn</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='disable' name='sse4.1'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850.json b/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
new file mode 100644 (file)
index 0000000..44be368
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 537921536
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 2
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2166366721
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 15,
+  "id": "model"
+}
+
+{
+  "return": 11,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Core(TM)2 Duo CPU     E6850  @ 3.00GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850.xml
new file mode 100644 (file)
index 0000000..d832076
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850.xml
@@ -0,0 +1,27 @@
+<!-- Intel(R) Core(TM)2 Duo CPU     E6850  @ 3.00GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000006fb' ebx='0x01020800' ecx='0x0000e3fd' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43049'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x04000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x04000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x04004143' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000001'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000220'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x44203229' ebx='0x43206f75' ecx='0x20205550' edx='0x45202020'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30353836' ebx='0x20402020' ecx='0x30302e33' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x10008040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
new file mode 100644 (file)
index 0000000..37feefa
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
@@ -0,0 +1,22 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Penryn</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <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='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='xsave'/>
+  <feature policy='require' name='osxsave'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
new file mode 100644 (file)
index 0000000..4dc2558
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
@@ -0,0 +1,22 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='xsave'/>
+  <feature name='osxsave'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500.xml
new file mode 100644 (file)
index 0000000..985263b
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500.xml
@@ -0,0 +1,30 @@
+<!-- Intel(R) Core(TM)2 Quad CPU    Q9500  @ 2.83GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x0001067a' ebx='0x03040800' ecx='0x0c08e3bd' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43048'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x0c000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x0c000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x0c004143' ebx='0x02c0003f' ecx='0x00000fff' edx='0x00000001'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00022220'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x51203229' ebx='0x20646175' ecx='0x20555043' edx='0x51202020'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30303539' ebx='0x20402020' ecx='0x33382e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0c006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
new file mode 100644 (file)
index 0000000..9858ee4
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
@@ -0,0 +1,24 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G4</model>
+  <vendor>AMD</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='extapic'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='require' name='ibs'/>
+  <feature policy='require' name='skinit'/>
+  <feature policy='require' name='wdt'/>
+  <feature policy='require' name='lwp'/>
+  <feature policy='require' name='nodeid_msr'/>
+  <feature policy='require' name='topoext'/>
+  <feature policy='require' name='perfctr_core'/>
+  <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
new file mode 100644 (file)
index 0000000..ec670c6
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -0,0 +1,24 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G4</model>
+  <vendor>AMD</vendor>
+  <feature name='vme'/>
+  <feature name='ht'/>
+  <feature name='monitor'/>
+  <feature name='osxsave'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='cmp_legacy'/>
+  <feature name='extapic'/>
+  <feature name='cr8legacy'/>
+  <feature name='osvw'/>
+  <feature name='ibs'/>
+  <feature name='skinit'/>
+  <feature name='wdt'/>
+  <feature name='lwp'/>
+  <feature name='nodeid_msr'/>
+  <feature name='topoext'/>
+  <feature name='perfctr_core'/>
+  <feature name='perfctr_nb'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150.xml b/tests/cputestdata/x86_64-cpuid-FX-8150.xml
new file mode 100644 (file)
index 0000000..20ac45d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150.xml
@@ -0,0 +1,49 @@
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00600f12' ebx='0x03080800' ecx='0x1e98220b' edx='0x178bfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00600f12' ebx='0x10000000' ecx='0x01c9bfff' edx='0x2fd3fbff'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x74285846' ecx='0x382d296d' edx='0x20303531'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x68676945' ebx='0x6f432d74' ecx='0x50206572' edx='0x65636f72'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x726f7373' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff20ff18' ebx='0xff20ff30' ecx='0x10040140' edx='0x40020140'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64000000' ebx='0x64004200' ecx='0x08008140' edx='0x0040c140'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000003d9'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00004007' edx='0x00000000'/>
+  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x000014ff'/>
+  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf020f018' ebx='0x64000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
+  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000001' ebx='0x00000101' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
new file mode 100644 (file)
index 0000000..828a142
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -0,0 +1,19 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='extapic'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='3dnowprefetch'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='require' name='ibs'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
new file mode 100644 (file)
index 0000000..399398e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -0,0 +1,19 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <feature name='vme'/>
+  <feature name='ht'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='3dnowext'/>
+  <feature name='3dnow'/>
+  <feature name='cmp_legacy'/>
+  <feature name='extapic'/>
+  <feature name='cr8legacy'/>
+  <feature name='3dnowprefetch'/>
+  <feature name='osvw'/>
+  <feature name='ibs'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352.xml
new file mode 100644 (file)
index 0000000..f3c2026
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352.xml
@@ -0,0 +1,37 @@
+<!-- Quad-Core AMD Opteron(tm) Processor 1352 -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000005' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00100f23' ebx='0x01040800' ecx='0x00802009' edx='0x178bfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001a' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00100f23' ebx='0x1000034f' ecx='0x000007ff' edx='0xefd3fbff'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x64617551' ebx='0x726f432d' ecx='0x4d412065' edx='0x704f2044'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6f726574' ebx='0x6d74286e' ecx='0x72502029' edx='0x7365636f'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20726f73' ebx='0x32353331' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff30ff10' ebx='0xff30ff20' ecx='0x40020140' edx='0x40020140'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x20800000' ebx='0x42004200' ecx='0x02008140' edx='0x0010a140'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000001f9'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00002003' edx='0x00000000'/>
+  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00000040' ecx='0x00000000' edx='0x00000007'/>
+  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf0300000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
new file mode 100644 (file)
index 0000000..828a142
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -0,0 +1,19 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='extapic'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='3dnowprefetch'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='require' name='ibs'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
new file mode 100644 (file)
index 0000000..399398e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -0,0 +1,19 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <feature name='vme'/>
+  <feature name='ht'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='3dnowext'/>
+  <feature name='3dnow'/>
+  <feature name='cmp_legacy'/>
+  <feature name='extapic'/>
+  <feature name='cr8legacy'/>
+  <feature name='3dnowprefetch'/>
+  <feature name='osvw'/>
+  <feature name='ibs'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
new file mode 100644 (file)
index 0000000..be4cf5c
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -0,0 +1,19 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G3</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='3dnowprefetch'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='disable' name='monitor'/>
+  <feature policy='disable' name='rdtscp'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350.json b/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
new file mode 100644 (file)
index 0000000..79b5afa
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
@@ -0,0 +1,71 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1015
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 3864004608
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2174754817
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 126614527
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 16,
+  "id": "family"
+}
+
+{
+  "return": 2,
+  "id": "model"
+}
+
+{
+  "return": 3,
+  "id": "stepping"
+}
+
+{
+  "return": "Quad-Core AMD Opteron(tm) Processor 2350",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350.xml
new file mode 100644 (file)
index 0000000..a928111
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350.xml
@@ -0,0 +1,37 @@
+<!-- Quad-Core AMD Opteron(tm) Processor 2350 -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000005' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00100f23' ebx='0x01040800' ecx='0x00802009' edx='0x178bfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001a' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00100f23' ebx='0x00000b2f' ecx='0x000007ff' edx='0xefd3fbff'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x64617551' ebx='0x726f432d' ecx='0x4d412065' edx='0x704f2044'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6f726574' ebx='0x6d74286e' ecx='0x72502029' edx='0x7365636f'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20726f73' ebx='0x30353332' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff30ff10' ebx='0xff30ff20' ecx='0x40020140' edx='0x40020140'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x20800000' ebx='0x42004200' ecx='0x02008140' edx='0x0010a140'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000001f9'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00002003' edx='0x00000000'/>
+  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00000040' ecx='0x00000000' edx='0x00000007'/>
+  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf0300000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
new file mode 100644 (file)
index 0000000..9858ee4
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
@@ -0,0 +1,24 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G4</model>
+  <vendor>AMD</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='extapic'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='require' name='ibs'/>
+  <feature policy='require' name='skinit'/>
+  <feature policy='require' name='wdt'/>
+  <feature policy='require' name='lwp'/>
+  <feature policy='require' name='nodeid_msr'/>
+  <feature policy='require' name='topoext'/>
+  <feature policy='require' name='perfctr_core'/>
+  <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
new file mode 100644 (file)
index 0000000..ec670c6
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -0,0 +1,24 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G4</model>
+  <vendor>AMD</vendor>
+  <feature name='vme'/>
+  <feature name='ht'/>
+  <feature name='monitor'/>
+  <feature name='osxsave'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='cmp_legacy'/>
+  <feature name='extapic'/>
+  <feature name='cr8legacy'/>
+  <feature name='osvw'/>
+  <feature name='ibs'/>
+  <feature name='skinit'/>
+  <feature name='wdt'/>
+  <feature name='lwp'/>
+  <feature name='nodeid_msr'/>
+  <feature name='topoext'/>
+  <feature name='perfctr_core'/>
+  <feature name='perfctr_nb'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
new file mode 100644 (file)
index 0000000..2e28342
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G4</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='tsc-deadline'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='disable' name='rdtscp'/>
+  <feature policy='disable' name='svm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234.json b/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
new file mode 100644 (file)
index 0000000..0df3860
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
@@ -0,0 +1,88 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 6,
+      "features": 4
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 9
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 68595
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 668204031
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 2
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2545426947
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 126614527
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 21,
+  "id": "family"
+}
+
+{
+  "return": 1,
+  "id": "model"
+}
+
+{
+  "return": 2,
+  "id": "stepping"
+}
+
+{
+  "return": "AMD Opteron(TM) Processor 6234                 ",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234.xml
new file mode 100644 (file)
index 0000000..9a89fd7
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234.xml
@@ -0,0 +1,51 @@
+<!-- AMD Opteron(TM) Processor 6234 -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00600f12' ebx='0x230c0800' ecx='0x1e98220b' edx='0x178bfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00600f12' ebx='0x30000000' ecx='0x01c9bfff' edx='0x2fd3fbff'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x6574704f' ecx='0x286e6f72' edx='0x20294d54'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x636f7250' ebx='0x6f737365' ecx='0x32362072' edx='0x20203433'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20202020' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff20ff18' ebx='0xff20ff30' ecx='0x10040140' edx='0x40020140'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64000000' ebx='0x64004200' ecx='0x08008140' edx='0x0060e140'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000003d9'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x0000500b' edx='0x00000000'/>
+  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x000014ff'/>
+  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf020f018' ebx='0x64000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
+  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000043' ebx='0x00000101' ecx='0x00000102' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
new file mode 100644 (file)
index 0000000..9858ee4
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
@@ -0,0 +1,24 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G4</model>
+  <vendor>AMD</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='extapic'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='require' name='ibs'/>
+  <feature policy='require' name='skinit'/>
+  <feature policy='require' name='wdt'/>
+  <feature policy='require' name='lwp'/>
+  <feature policy='require' name='nodeid_msr'/>
+  <feature policy='require' name='topoext'/>
+  <feature policy='require' name='perfctr_core'/>
+  <feature policy='require' name='perfctr_nb'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
new file mode 100644 (file)
index 0000000..ec670c6
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -0,0 +1,24 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G4</model>
+  <vendor>AMD</vendor>
+  <feature name='vme'/>
+  <feature name='ht'/>
+  <feature name='monitor'/>
+  <feature name='osxsave'/>
+  <feature name='mmxext'/>
+  <feature name='fxsr_opt'/>
+  <feature name='cmp_legacy'/>
+  <feature name='extapic'/>
+  <feature name='cr8legacy'/>
+  <feature name='osvw'/>
+  <feature name='ibs'/>
+  <feature name='skinit'/>
+  <feature name='wdt'/>
+  <feature name='lwp'/>
+  <feature name='nodeid_msr'/>
+  <feature name='topoext'/>
+  <feature name='perfctr_core'/>
+  <feature name='perfctr_nb'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282.xml
new file mode 100644 (file)
index 0000000..6e6b81d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282.xml
@@ -0,0 +1,51 @@
+<!-- AMD Opteron(tm) Processor 6282 SE -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00600f12' ebx='0x0b100800' ecx='0x1e98220b' edx='0x178bfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x000003c0' edx='0x40000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x3e' eax='0x00000080' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001e' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00600f12' ebx='0x30000000' ecx='0x01c9bfff' edx='0x2fd3fbff'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x6574704f' ecx='0x286e6f72' edx='0x20296d74'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x636f7250' ebx='0x6f737365' ecx='0x32362072' edx='0x53203238'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20202045' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff20ff18' ebx='0xff20ff30' ecx='0x10040140' edx='0x40020140'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x64000000' ebx='0x64004200' ecx='0x08008140' edx='0x0060e140'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000003d9'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x0000500f' edx='0x00000000'/>
+  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00010000' ecx='0x00000000' edx='0x000014ff'/>
+  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf020f018' ebx='0x64000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000000ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x80032013' ecx='0x00010200' edx='0x8000000f'/>
+  <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00000121' ebx='0x00c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x0000002b' ebx='0x00000105' ecx='0x00000101' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
new file mode 100644 (file)
index 0000000..f893f9f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -0,0 +1,24 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>core2duo</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='popcnt'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='rdtscp'/>
+  <feature policy='require' name='lahf_lm'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
new file mode 100644 (file)
index 0000000..3975aa7
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
@@ -0,0 +1,24 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>core2duo</model>
+  <vendor>Intel</vendor>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='ds_cpl'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='cx16'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='popcnt'/>
+  <feature name='arat'/>
+  <feature name='rdtscp'/>
+  <feature name='lahf_lm'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100.xml
new file mode 100644 (file)
index 0000000..0d63060
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100.xml
@@ -0,0 +1,30 @@
+<!-- Intel(R) Pentium(R) CPU        P6100  @ 2.00GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00020655' ebx='0x00100800' ecx='0x0082e39d' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b0dd' ecx='0x00000000' edx='0x09ca212c'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x00c0003f' ecx='0x0000007f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x02c0003f' ecx='0x00000fff' edx='0x00000002'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000005' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000004' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000002' ecx='0x00000201' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6e655020' edx='0x6d756974'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x20295228' ebx='0x20555043' ecx='0x20202020' edx='0x50202020'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30303136' ebx='0x20402020' ecx='0x30302e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
new file mode 100644 (file)
index 0000000..60ba9c1
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -0,0 +1,22 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='extapic'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='3dnowprefetch'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='require' name='ibs'/>
+  <feature policy='require' name='skinit'/>
+  <feature policy='require' name='wdt'/>
+  <feature policy='require' name='invtsc'/>
+  <feature policy='disable' name='nx'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
new file mode 100644 (file)
index 0000000..127b047
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
@@ -0,0 +1,31 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>athlon</model>
+  <vendor>AMD</vendor>
+  <feature name='mca'/>
+  <feature name='clflush'/>
+  <feature name='ht'/>
+  <feature name='pni'/>
+  <feature name='monitor'/>
+  <feature name='cx16'/>
+  <feature name='popcnt'/>
+  <feature name='syscall'/>
+  <feature name='fxsr_opt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='rdtscp'/>
+  <feature name='lm'/>
+  <feature name='lahf_lm'/>
+  <feature name='cmp_legacy'/>
+  <feature name='svm'/>
+  <feature name='extapic'/>
+  <feature name='cr8legacy'/>
+  <feature name='abm'/>
+  <feature name='sse4a'/>
+  <feature name='misalignsse'/>
+  <feature name='3dnowprefetch'/>
+  <feature name='osvw'/>
+  <feature name='ibs'/>
+  <feature name='skinit'/>
+  <feature name='wdt'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
new file mode 100644 (file)
index 0000000..c1070de
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -0,0 +1,20 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Opteron_G3</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='mmxext'/>
+  <feature policy='require' name='fxsr_opt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='3dnowext'/>
+  <feature policy='require' name='3dnow'/>
+  <feature policy='require' name='cmp_legacy'/>
+  <feature policy='require' name='cr8legacy'/>
+  <feature policy='require' name='3dnowprefetch'/>
+  <feature policy='require' name='osvw'/>
+  <feature policy='disable' name='monitor'/>
+  <feature policy='disable' name='nx'/>
+  <feature policy='disable' name='rdtscp'/>
+  <feature policy='disable' name='svm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95.json b/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
new file mode 100644 (file)
index 0000000..5f5badd
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 9
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1011
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 3862956032
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2157977601
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 126614527
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 16,
+  "id": "family"
+}
+
+{
+  "return": 4,
+  "id": "model"
+}
+
+{
+  "return": 2,
+  "id": "stepping"
+}
+
+{
+  "return": "AMD Phenom(tm) II X4 B95 Processor",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95.xml
new file mode 100644 (file)
index 0000000..ad989f9
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95.xml
@@ -0,0 +1,38 @@
+<!-- AMD Phenom(tm) II X4 B95 Processor -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000005' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00100f42' ebx='0x00040800' ecx='0x00802009' edx='0x178bfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x8000001b' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00100f42' ebx='0x10003df6' ecx='0x000037ff' edx='0xefc3fbff'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x6e656850' ecx='0x74286d6f' edx='0x4920296d'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x34582049' ebx='0x35394220' ecx='0x6f725020' edx='0x73736563'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x0000726f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff30ff10' ebx='0xff30ff20' ecx='0x40020140' edx='0x40020140'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x20800000' ebx='0x42004200' ecx='0x02008140' edx='0x0030b140'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000001f9'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x00000000' ecx='0x00002003' edx='0x00000000'/>
+  <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00000040' ecx='0x00000000' edx='0x0000000f'/>
+  <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf0300000' ebx='0x60100000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000003' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x0000001f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
new file mode 100644 (file)
index 0000000..28d112b
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
@@ -0,0 +1,21 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Conroe</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='cx16'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='dca'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
new file mode 100644 (file)
index 0000000..ca3a84c
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
@@ -0,0 +1,21 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Conroe</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='tm2'/>
+  <feature name='cx16'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='dca'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110.xml
new file mode 100644 (file)
index 0000000..557c7dc
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110.xml
@@ -0,0 +1,27 @@
+<!-- Intel(R) Xeon(R) CPU            5110  @ 1.60GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000006f6' ebx='0x07020800' ecx='0x0004e33d' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43049'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x04000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x04000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x04004143' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000001'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000020'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x20202020' ecx='0x20202020' edx='0x20202020'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30313135' ebx='0x20402020' ecx='0x30362e31' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x10008040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
new file mode 100644 (file)
index 0000000..0ab5a7a
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
@@ -0,0 +1,26 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Skylake-Client</model>
+  <vendor>Intel</vendor>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='xsaves'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml
new file mode 100644 (file)
index 0000000..c799394
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml
@@ -0,0 +1,26 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Skylake-Client</model>
+  <vendor>Intel</vendor>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='osxsave'/>
+  <feature name='tsc_adjust'/>
+  <feature name='clflushopt'/>
+  <feature name='xsaves'/>
+  <feature name='pdpe1gb'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
new file mode 100644 (file)
index 0000000..7a8246e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Skylake-Client</model>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
new file mode 100644 (file)
index 0000000..10fbe06
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
@@ -0,0 +1,88 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 6,
+      "features": 4
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 7
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 289
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 10244027
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4160369187
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 94,
+  "id": "model"
+}
+
+{
+  "return": 3,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
new file mode 100644 (file)
index 0000000..42992db
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
@@ -0,0 +1,46 @@
+<!-- Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000124' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000dac' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d334520' ecx='0x35343231' edx='0x20357620'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e332040' ebx='0x48473035' ecx='0x0000007a' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000dac' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000dac' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
new file mode 100644 (file)
index 0000000..b02d963
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
@@ -0,0 +1,32 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='cmt'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml
new file mode 100644 (file)
index 0000000..431a737
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml
@@ -0,0 +1,32 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='dca'/>
+  <feature name='osxsave'/>
+  <feature name='f16c'/>
+  <feature name='rdrand'/>
+  <feature name='arat'/>
+  <feature name='tsc_adjust'/>
+  <feature name='cmt'/>
+  <feature name='xsaveopt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='abm'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
new file mode 100644 (file)
index 0000000..6b4edc3
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
@@ -0,0 +1,13 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell-noTSX</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
new file mode 100644 (file)
index 0000000..f1affa4
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 33
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 1963
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4160369155
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 63,
+  "id": "model"
+}
+
+{
+  "return": 2,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml
new file mode 100644 (file)
index 0000000..dc640ac
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml
@@ -0,0 +1,37 @@
+<!-- Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000f' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306f2' ebx='0x13100800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c10000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x04c0003f' ecx='0x00003fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000037ab' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000013'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000010' ecx='0x00000201' edx='0x00000013'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000001f' ecx='0x00000000' edx='0x00000002'/>
+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00008000' ecx='0x0000001f' edx='0x00000001'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d354520' ecx='0x30333632' edx='0x20337620'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e322040' ebx='0x48473034' ecx='0x0000007a' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x0000001f' ecx='0x00000000' edx='0x00000002'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x0000001f' ecx='0x00000000' edx='0x00000002'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
new file mode 100644 (file)
index 0000000..b02d963
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -0,0 +1,32 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='cmt'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
new file mode 100644 (file)
index 0000000..431a737
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -0,0 +1,32 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='dca'/>
+  <feature name='osxsave'/>
+  <feature name='f16c'/>
+  <feature name='rdrand'/>
+  <feature name='arat'/>
+  <feature name='tsc_adjust'/>
+  <feature name='cmt'/>
+  <feature name='xsaveopt'/>
+  <feature name='pdpe1gb'/>
+  <feature name='abm'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
new file mode 100644 (file)
index 0000000..36b7bf2
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -0,0 +1,12 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Haswell-noTSX</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
new file mode 100644 (file)
index 0000000..2cd15f6
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
@@ -0,0 +1,71 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 33
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 1961
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 4160369187
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 63,
+  "id": "model"
+}
+
+{
+  "return": 2,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Xeon(R) CPU E5-2650 v3 @ 2.30GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
new file mode 100644 (file)
index 0000000..2b73adf
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
@@ -0,0 +1,37 @@
+<!-- Intel(R) Xeon(R) CPU E5-2650 v3 @ 2.30GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000f' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306f2' ebx='0x03200800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c10000'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x04c0003f' ecx='0x00004fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000037ab' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x00000014' ecx='0x00000201' edx='0x00000003'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000027' ecx='0x00000000' edx='0x00000002'/>
+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x0000a000' ecx='0x00000027' edx='0x00000001'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d354520' ecx='0x30353632' edx='0x20337620'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e322040' ebx='0x48473033' ecx='0x0000007a' edx='0x00000000'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000027' ecx='0x00000000' edx='0x00000002'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000027' ecx='0x00000000' edx='0x00000002'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
new file mode 100644 (file)
index 0000000..81bf8c8
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -0,0 +1,29 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='arat'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='invtsc'/>
+  <feature policy='disable' name='tsc-deadline'/>
+  <feature policy='disable' name='xsave'/>
+  <feature policy='disable' name='avx'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
new file mode 100644 (file)
index 0000000..5290247
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -0,0 +1,29 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Westmere</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='pclmuldq'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='smx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='pcid'/>
+  <feature name='dca'/>
+  <feature name='x2apic'/>
+  <feature name='arat'/>
+  <feature name='pdpe1gb'/>
+  <feature name='rdtscp'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
new file mode 100644 (file)
index 0000000..ff6ab65
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -0,0 +1,12 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>SandyBridge</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='pdpe1gb'/>
+  <feature policy='disable' name='xsave'/>
+  <feature policy='disable' name='avx'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
new file mode 100644 (file)
index 0000000..a884613
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 739248128
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 2
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2210013699
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 47,
+  "id": "model"
+}
+
+{
+  "return": 2,
+  "id": "stepping"
+}
+
+{
+  "return": "       Intel(R) Xeon(R) CPU E7- 4820  @ 2.00GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.xml
new file mode 100644 (file)
index 0000000..c0d9982
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.xml
@@ -0,0 +1,30 @@
+<!-- Intel(R) Xeon(R) CPU E7- 4820  @ 2.00GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206f2' ebx='0x02400800' ecx='0x02bee3ff' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b0eb' ecx='0x00000000' edx='0x09ca212c'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x7c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x7c004122' ebx='0x00c0003f' ecx='0x0000007f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x7c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x7c0fc163' ebx='0x05c0003f' ecx='0x00002fff' edx='0x00000006'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000007' ebx='0x00000001' ecx='0x00000009' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000004' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000006' ebx='0x00000010' ecx='0x00000201' edx='0x00000002'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x2c100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020' ecx='0x6c65746e' edx='0x20295228'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6e6f6558' ebx='0x20295228' ecx='0x20555043' edx='0x202d3745'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30323834' ebx='0x20402020' ecx='0x30302e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302c' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000002'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
new file mode 100644 (file)
index 0000000..4037fa6
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -0,0 +1,23 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Nehalem</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <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='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='rdtscp'/>
+  <feature policy='require' name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
new file mode 100644 (file)
index 0000000..c4a9226
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -0,0 +1,23 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Nehalem</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='dca'/>
+  <feature name='rdtscp'/>
+  <feature name='invtsc'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
new file mode 100644 (file)
index 0000000..1aadbf3
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -0,0 +1,10 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Nehalem</model>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='x2apic'/>
+  <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='rdtscp'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
new file mode 100644 (file)
index 0000000..c75594d
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
@@ -0,0 +1,77 @@
+{
+  "return": [
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-ecx": 1,
+      "cpuid-input-eax": 13,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483658,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EAX",
+      "cpuid-input-eax": 1073741825,
+      "features": 16777467
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 3221225473,
+      "features": 0
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483655,
+      "features": 0
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 2147483649,
+      "features": 1
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 2147483649,
+      "features": 672139264
+    },
+    {
+      "cpuid-register": "EBX",
+      "cpuid-input-ecx": 0,
+      "cpuid-input-eax": 7,
+      "features": 2
+    },
+    {
+      "cpuid-register": "ECX",
+      "cpuid-input-eax": 1,
+      "features": 2159550977
+    },
+    {
+      "cpuid-register": "EDX",
+      "cpuid-input-eax": 1,
+      "features": 260832255
+    }
+  ],
+  "id": "feature-words"
+}
+
+{
+  "return": 6,
+  "id": "family"
+}
+
+{
+  "return": 26,
+  "id": "model"
+}
+
+{
+  "return": 5,
+  "id": "stepping"
+}
+
+{
+  "return": "Intel(R) Xeon(R) CPU           W3520  @ 2.67GHz",
+  "id": "model-id"
+}

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.xml
new file mode 100644 (file)
index 0000000..0d357f7
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.xml
@@ -0,0 +1,30 @@
+<!-- Intel(R) Xeon(R) CPU           W3520  @ 2.67GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000106a5' ebx='0x05100800' ecx='0x009ce3bd' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b2e4' ecx='0x00000000' edx='0x09ca212c'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x00c0003f' ecx='0x0000007f' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000002'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001120'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000003' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000044' ecx='0x00000000' edx='0x00000603'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000005'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x20202020' ecx='0x20202020' edx='0x57202020'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30323533' ebx='0x20402020' ecx='0x37362e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
new file mode 100644 (file)
index 0000000..9e21934
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
@@ -0,0 +1,21 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Penryn</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <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='dtes64'/>
+  <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='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='dca'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
new file mode 100644 (file)
index 0000000..e73c478
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
@@ -0,0 +1,21 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='dca'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460.xml
new file mode 100644 (file)
index 0000000..5e58a3f
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460.xml
@@ -0,0 +1,27 @@
+<!-- Intel(R) Xeon(R) CPU           X5460  @ 3.16GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00010676' ebx='0x01040800' ecx='0x000ce3bd' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb4304e'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x0c000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x0c000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x0c004143' ebx='0x05c0003f' ecx='0x00000fff' edx='0x00000001'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002220'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x20202020' ecx='0x20202020' edx='0x58202020'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30363435' ebx='0x20402020' ecx='0x36312e33' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x18008040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003026' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+</cpudata>

diff --git a/tests/cputestdata/x86_64-exact-disable-extra.xml b/tests/cputestdata/x86_64-exact-disable-extra.xml
new file mode 100644 (file)
index 0000000..c84bd5b
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-disable-extra.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='3dnowext' policy='disable'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-disable.xml b/tests/cputestdata/x86_64-exact-disable.xml
new file mode 100644 (file)
index 0000000..202eb27
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-disable.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='vmx' policy='disable'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-disable2.xml b/tests/cputestdata/x86_64-exact-disable2.xml
new file mode 100644 (file)
index 0000000..9baa58b
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-disable2.xml
@@ -0,0 +1,5 @@
+<cpu match='exact'>
+  <model>Nehalem</model>
+  <feature name='popcnt' policy='disable'/>
+  <feature name='sse4.2' policy='disable'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-forbid-extra.xml b/tests/cputestdata/x86_64-exact-forbid-extra.xml
new file mode 100644 (file)
index 0000000..0a261ad
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-forbid-extra.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='3dnowext' policy='forbid'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-forbid.xml b/tests/cputestdata/x86_64-exact-forbid.xml
new file mode 100644 (file)
index 0000000..d9660ca
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-forbid.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='vmx' policy='forbid'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-force-Haswell.xml b/tests/cputestdata/x86_64-exact-force-Haswell.xml
new file mode 100644 (file)
index 0000000..614ed7e
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-force-Haswell.xml
@@ -0,0 +1,15 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Haswell</model>
+  <feature policy='force' name='pcid'/>
+  <feature policy='force' name='rtm'/>
+  <feature policy='force' name='invpcid'/>
+  <feature policy='force' name='erms'/>
+  <feature policy='force' name='bmi2'/>
+  <feature policy='optional' name='smep'/>
+  <feature policy='optional' name='avx2'/>
+  <feature policy='optional' name='hle'/>
+  <feature policy='force' name='bmi1'/>
+  <feature policy='force' name='fsgsbase'/>
+  <feature policy='disable' name='movbe'/>
+  <feature policy='disable' name='fma'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-force.xml b/tests/cputestdata/x86_64-exact-force.xml
new file mode 100644 (file)
index 0000000..c0fa127
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-force.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='3dnowext' policy='force'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-require-extra.xml b/tests/cputestdata/x86_64-exact-require-extra.xml
new file mode 100644 (file)
index 0000000..5e89cda
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-require-extra.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='3dnowext' policy='require'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact-require.xml b/tests/cputestdata/x86_64-exact-require.xml
new file mode 100644 (file)
index 0000000..2d196df
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact-require.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='sse4.1' policy='require'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-exact.xml b/tests/cputestdata/x86_64-exact.xml
new file mode 100644 (file)
index 0000000..18b7ef4
--- /dev/null
+++ b/tests/cputestdata/x86_64-exact.xml
@@ -0,0 +1,3 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-guest-nofallback.xml b/tests/cputestdata/x86_64-guest-nofallback.xml
new file mode 100644 (file)
index 0000000..babe47d
--- /dev/null
+++ b/tests/cputestdata/x86_64-guest-nofallback.xml
@@ -0,0 +1,18 @@
+<cpu match='exact'>
+  <model fallback='forbid'>Penryn</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <!--feature name='sse4.1' policy='optional'/-->
+  <feature name='dca' policy='optional'/>
+  <feature name='xtpr' policy='optional'/>
+  <feature name='sse4.2' policy='optional'/>
+  <feature name='3dnow' policy='optional'/>
+  <feature name='ssse3' policy='optional'/>
+  <feature name='vmx' policy='disable'/>
+  <feature name='ds_cpl' policy='disable'/>
+  <feature name='sse' policy='disable'/>
+  <feature name='monitor' policy='force'/>
+  <feature name='pbe' policy='force'/>
+  <feature name='3dnowext' policy='force'/>
+  <feature name='svm' policy='force'/>
+  <feature name='popcnt' policy='forbid'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-guest.xml b/tests/cputestdata/x86_64-guest.xml
new file mode 100644 (file)
index 0000000..d8685e6
--- /dev/null
+++ b/tests/cputestdata/x86_64-guest.xml
@@ -0,0 +1,18 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <!--feature name='sse4.1' policy='optional'/-->
+  <feature name='dca' policy='optional'/>
+  <feature name='xtpr' policy='optional'/>
+  <feature name='sse4.2' policy='optional'/>
+  <feature name='3dnow' policy='optional'/>
+  <feature name='ssse3' policy='optional'/>
+  <feature name='vmx' policy='disable'/>
+  <feature name='ds_cpl' policy='disable'/>
+  <feature name='sse' policy='disable'/>
+  <feature name='monitor' policy='force'/>
+  <feature name='pbe' policy='force'/>
+  <feature name='3dnowext' policy='force'/>
+  <feature name='svm' policy='force'/>
+  <feature name='popcnt' policy='forbid'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml
new file mode 100644 (file)
index 0000000..85564ff
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml
@@ -0,0 +1,43 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>486</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature policy='require' name='de'/>
+  <feature policy='require' name='tsc'/>
+  <feature policy='require' name='msr'/>
+  <feature policy='require' name='pae'/>
+  <feature policy='require' name='mce'/>
+  <feature policy='require' name='cx8'/>
+  <feature policy='require' name='apic'/>
+  <feature policy='require' name='sep'/>
+  <feature policy='require' name='mtrr'/>
+  <feature policy='require' name='pge'/>
+  <feature policy='require' name='mca'/>
+  <feature policy='require' name='cmov'/>
+  <feature policy='require' name='pat'/>
+  <feature policy='require' name='pse36'/>
+  <feature policy='require' name='clflush'/>
+  <feature policy='require' name='mmx'/>
+  <feature policy='require' name='fxsr'/>
+  <feature policy='require' name='sse2'/>
+  <feature policy='force' name='pbe'/>
+  <feature policy='require' name='pni'/>
+  <feature policy='force' name='monitor'/>
+  <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='syscall'/>
+  <feature policy='require' name='nx'/>
+  <feature policy='require' name='lm'/>
+  <feature policy='force' name='3dnowext'/>
+  <feature policy='require' name='lahf_lm'/>
+  <feature policy='force' name='svm'/>
+  <feature policy='disable' name='vme'/>
+  <feature policy='disable' name='sse4.2'/>
+  <feature policy='disable' name='3dnow'/>
+  <feature policy='disable' name='vmx'/>
+  <feature policy='disable' name='ds_cpl'/>
+  <feature policy='disable' name='sse'/>
+  <feature policy='forbid' name='popcnt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml
new file mode 100644 (file)
index 0000000..f79ed32
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Nehalem</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature policy='force' name='pbe'/>
+  <feature policy='force' name='monitor'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='force' name='3dnowext'/>
+  <feature policy='force' name='svm'/>
+  <feature policy='disable' name='sse'/>
+  <feature policy='disable' name='sse4.2'/>
+  <feature policy='forbid' name='popcnt'/>
+  <feature policy='disable' name='3dnow'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='disable' name='vmx'/>
+  <feature policy='disable' name='ds_cpl'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+guest-result.xml b/tests/cputestdata/x86_64-host+guest-result.xml
new file mode 100644 (file)
index 0000000..137a3d6
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+guest-result.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Penryn</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='disable' name='sse4.2'/>
+  <feature policy='disable' name='3dnow'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='disable' name='vmx'/>
+  <feature policy='disable' name='ds_cpl'/>
+  <feature policy='disable' name='sse'/>
+  <feature policy='force' name='monitor'/>
+  <feature policy='force' name='pbe'/>
+  <feature policy='force' name='3dnowext'/>
+  <feature policy='force' name='svm'/>
+  <feature policy='forbid' name='popcnt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+guest.xml b/tests/cputestdata/x86_64-host+guest.xml
new file mode 100644 (file)
index 0000000..137a3d6
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+guest.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Penryn</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='disable' name='sse4.2'/>
+  <feature policy='disable' name='3dnow'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='disable' name='vmx'/>
+  <feature policy='disable' name='ds_cpl'/>
+  <feature policy='disable' name='sse'/>
+  <feature policy='force' name='monitor'/>
+  <feature policy='force' name='pbe'/>
+  <feature policy='force' name='3dnowext'/>
+  <feature policy='force' name='svm'/>
+  <feature policy='forbid' name='popcnt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+host+host-model,models-result.xml b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
new file mode 100644 (file)
index 0000000..4be4701
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
@@ -0,0 +1,21 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>core2duo</model>
+  <vendor>Intel</vendor>
+  <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='lahf_lm'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+host-model-nofallback.xml b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
new file mode 100644 (file)
index 0000000..0c3ede0
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
@@ -0,0 +1,19 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='forbid'>Penryn</model>
+  <vendor>Intel</vendor>
+  <topology sockets='1' cores='2' threads='1'/>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+host-model.xml b/tests/cputestdata/x86_64-host+host-model.xml
new file mode 100644 (file)
index 0000000..a284767
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+host-model.xml
@@ -0,0 +1,18 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Penryn</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+host-passthrough-features.xml b/tests/cputestdata/x86_64-host+host-passthrough-features.xml
new file mode 100644 (file)
index 0000000..dc2b775
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+host-passthrough-features.xml
@@ -0,0 +1,4 @@
+<cpu mode='host-passthrough'>
+  <feature policy='disable' name='dca'/>
+  <feature policy='force' name='vmx'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+host-passthrough.xml b/tests/cputestdata/x86_64-host+host-passthrough.xml
new file mode 100644 (file)
index 0000000..655c7a7
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+host-passthrough.xml
@@ -0,0 +1 @@
+<cpu mode='host-passthrough'/>

diff --git a/tests/cputestdata/x86_64-host+min.xml b/tests/cputestdata/x86_64-host+min.xml
new file mode 100644 (file)
index 0000000..8101151
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+min.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Penryn</model>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+penryn-force-result.xml b/tests/cputestdata/x86_64-host+penryn-force-result.xml
new file mode 100644 (file)
index 0000000..bb624c0
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+penryn-force-result.xml
@@ -0,0 +1,5 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Penryn</model>
+  <feature policy='force' name='popcnt'/>
+  <feature policy='force' name='sse4.2'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+pentium3.xml b/tests/cputestdata/x86_64-host+pentium3.xml
new file mode 100644 (file)
index 0000000..8101151
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+pentium3.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Penryn</model>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host+strict-force-extra-result.xml b/tests/cputestdata/x86_64-host+strict-force-extra-result.xml
new file mode 100644 (file)
index 0000000..74b3327
--- /dev/null
+++ b/tests/cputestdata/x86_64-host+strict-force-extra-result.xml
@@ -0,0 +1,18 @@
+<cpu mode='custom' match='strict'>
+  <model fallback='allow'>Penryn</model>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='vme'/>
+  <feature policy='force' name='3dnow'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
new file mode 100644 (file)
index 0000000..2dbe06c
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
@@ -0,0 +1,6 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Haswell</model>
+  <topology sockets='1' cores='2' threads='2'/>
+  <feature policy='disable' name='rtm'/>
+  <feature policy='disable' name='hle'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
new file mode 100644 (file)
index 0000000..5d149bb
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
@@ -0,0 +1,6 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Haswell</model>
+  <topology sockets='1' cores='2' threads='2'/>
+  <feature policy='disable' name='hle'/>
+  <feature policy='disable' name='rtm'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
new file mode 100644 (file)
index 0000000..3b74089
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
@@ -0,0 +1,4 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Haswell-noTSX</model>
+  <topology sockets='1' cores='2' threads='2'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX.xml
new file mode 100644 (file)
index 0000000..c003085
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-Haswell-noTSX.xml
@@ -0,0 +1,6 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Haswell-noTSX</model>
+  <vendor>Intel</vendor>
+  <topology sockets='1' cores='2' threads='2'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-SandyBridge.xml b/tests/cputestdata/x86_64-host-SandyBridge.xml
new file mode 100644 (file)
index 0000000..7f26b7b
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-SandyBridge.xml
@@ -0,0 +1,6 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <topology sockets='1' cores='2' threads='2'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-amd-fake.xml b/tests/cputestdata/x86_64-host-amd-fake.xml
new file mode 100644 (file)
index 0000000..c81990a
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-amd-fake.xml
@@ -0,0 +1,20 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>AMD</vendor>
+  <topology sockets='1' cores='4' threads='1'/>
+  <feature name='dca'/>
+  <feature name='xtpr'/>
+  <feature name='tm2'/>
+  <feature name='est'/>
+  <feature name='vmx'/>
+  <feature name='ds_cpl'/>
+  <feature name='monitor'/>
+  <feature name='pbe'/>
+  <feature name='tm'/>
+  <feature name='ht'/>
+  <feature name='ss'/>
+  <feature name='acpi'/>
+  <feature name='ds'/>
+  <feature name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-amd.xml b/tests/cputestdata/x86_64-host-amd.xml
new file mode 100644 (file)
index 0000000..e662829
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-amd.xml
@@ -0,0 +1,18 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Opteron_G3</model>
+  <vendor>AMD</vendor>
+  <topology sockets='8' cores='1' threads='1'/>
+  <feature name='osvw'/>
+  <feature name='3dnowprefetch'/>
+  <feature name='cr8legacy'/>
+  <feature name='extapic'/>
+  <feature name='cmp_legacy'/>
+  <feature name='3dnow'/>
+  <feature name='3dnowext'/>
+  <feature name='pdpe1gb'/>
+  <feature name='fxsr_opt'/>
+  <feature name='mmxext'/>
+  <feature name='ht'/>
+  <feature name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-better+pentium3-result.xml b/tests/cputestdata/x86_64-host-better+pentium3-result.xml
new file mode 100644 (file)
index 0000000..9d4f98f
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-better+pentium3-result.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Nehalem</model>
+  <feature policy='require' name='dca'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-better.xml b/tests/cputestdata/x86_64-host-better.xml
new file mode 100644 (file)
index 0000000..8340f11
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-better.xml
@@ -0,0 +1,20 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Nehalem</model>
+  <vendor>Intel</vendor>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature name='dca'/>
+  <feature name='xtpr'/>
+  <feature name='tm2'/>
+  <feature name='est'/>
+  <feature name='vmx'/>
+  <feature name='ds_cpl'/>
+  <feature name='monitor'/>
+  <feature name='pbe'/>
+  <feature name='tm'/>
+  <feature name='ht'/>
+  <feature name='ss'/>
+  <feature name='acpi'/>
+  <feature name='ds'/>
+  <feature name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-incomp-arch.xml b/tests/cputestdata/x86_64-host-incomp-arch.xml
new file mode 100644 (file)
index 0000000..f7c064e
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-incomp-arch.xml
@@ -0,0 +1,6 @@
+<cpu>
+  <arch>ia64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <topology sockets='1' cores='4' threads='1'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-invtsc+host-model.xml b/tests/cputestdata/x86_64-host-invtsc+host-model.xml
new file mode 100644 (file)
index 0000000..998ed23
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-invtsc+host-model.xml
@@ -0,0 +1,22 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='pcid'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='smx'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='dtes64'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-invtsc.xml b/tests/cputestdata/x86_64-host-invtsc.xml
new file mode 100644 (file)
index 0000000..f558399
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-invtsc.xml
@@ -0,0 +1,27 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>SandyBridge</model>
+  <vendor>Intel</vendor>
+  <topology sockets='1' cores='2' threads='2'/>
+  <feature name='invtsc'/>
+  <feature name='osxsave'/>
+  <feature name='pcid'/>
+  <feature name='pdcm'/>
+  <feature name='xtpr'/>
+  <feature name='tm2'/>
+  <feature name='est'/>
+  <feature name='smx'/>
+  <feature name='vmx'/>
+  <feature name='ds_cpl'/>
+  <feature name='monitor'/>
+  <feature name='dtes64'/>
+  <feature name='pbe'/>
+  <feature name='tm'/>
+  <feature name='ht'/>
+  <feature name='ss'/>
+  <feature name='acpi'/>
+  <feature name='ds'/>
+  <feature name='vme'/>
+  <pages unit='KiB' size='4'/>
+  <pages unit='KiB' size='2048'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-model-nofallback.xml b/tests/cputestdata/x86_64-host-model-nofallback.xml
new file mode 100644 (file)
index 0000000..4e42eb4
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-model-nofallback.xml
@@ -0,0 +1,4 @@
+<cpu mode='host-model'>
+  <model fallback='forbid'/>
+  <topology sockets='1' cores='2' threads='1'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-model.xml b/tests/cputestdata/x86_64-host-model.xml
new file mode 100644 (file)
index 0000000..fd50c03
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-model.xml
@@ -0,0 +1 @@
+<cpu mode='host-model'/>

diff --git a/tests/cputestdata/x86_64-host-no-vendor.xml b/tests/cputestdata/x86_64-host-no-vendor.xml
new file mode 100644 (file)
index 0000000..efb0a44
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-no-vendor.xml
@@ -0,0 +1,19 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature name='dca'/>
+  <feature name='xtpr'/>
+  <feature name='tm2'/>
+  <feature name='est'/>
+  <feature name='vmx'/>
+  <feature name='ds_cpl'/>
+  <feature name='monitor'/>
+  <feature name='pbe'/>
+  <feature name='tm'/>
+  <feature name='ht'/>
+  <feature name='ss'/>
+  <feature name='acpi'/>
+  <feature name='ds'/>
+  <feature name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-passthrough-features.xml b/tests/cputestdata/x86_64-host-passthrough-features.xml
new file mode 100644 (file)
index 0000000..dc2b775
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-passthrough-features.xml
@@ -0,0 +1,4 @@
+<cpu mode='host-passthrough'>
+  <feature policy='disable' name='dca'/>
+  <feature policy='force' name='vmx'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-passthrough.xml b/tests/cputestdata/x86_64-host-passthrough.xml
new file mode 100644 (file)
index 0000000..655c7a7
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-passthrough.xml
@@ -0,0 +1 @@
+<cpu mode='host-passthrough'/>

diff --git a/tests/cputestdata/x86_64-host-worse+guest-result.xml b/tests/cputestdata/x86_64-host-worse+guest-result.xml
new file mode 100644 (file)
index 0000000..2edc875
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-worse+guest-result.xml
@@ -0,0 +1,17 @@
+<cpu mode='custom' match='exact'>
+  <model fallback='allow'>Penryn</model>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature policy='disable' name='dca'/>
+  <feature policy='disable' name='xtpr'/>
+  <feature policy='disable' name='sse4.2'/>
+  <feature policy='disable' name='3dnow'/>
+  <feature policy='require' name='ssse3'/>
+  <feature policy='disable' name='vmx'/>
+  <feature policy='disable' name='ds_cpl'/>
+  <feature policy='disable' name='sse'/>
+  <feature policy='force' name='monitor'/>
+  <feature policy='force' name='pbe'/>
+  <feature policy='force' name='3dnowext'/>
+  <feature policy='force' name='svm'/>
+  <feature policy='forbid' name='popcnt'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host-worse.xml b/tests/cputestdata/x86_64-host-worse.xml
new file mode 100644 (file)
index 0000000..dcf4670
--- /dev/null
+++ b/tests/cputestdata/x86_64-host-worse.xml
@@ -0,0 +1,6 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <topology sockets='2' cores='4' threads='1'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-host.xml b/tests/cputestdata/x86_64-host.xml
new file mode 100644 (file)
index 0000000..f1c163d
--- /dev/null
+++ b/tests/cputestdata/x86_64-host.xml
@@ -0,0 +1,20 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <topology sockets='2' cores='4' threads='1'/>
+  <feature name='dca'/>
+  <feature name='xtpr'/>
+  <feature name='tm2'/>
+  <feature name='est'/>
+  <feature name='vmx'/>
+  <feature name='ds_cpl'/>
+  <feature name='monitor'/>
+  <feature name='pbe'/>
+  <feature name='tm'/>
+  <feature name='ht'/>
+  <feature name='ss'/>
+  <feature name='acpi'/>
+  <feature name='ds'/>
+  <feature name='vme'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-min.xml b/tests/cputestdata/x86_64-min.xml
new file mode 100644 (file)
index 0000000..795645d
--- /dev/null
+++ b/tests/cputestdata/x86_64-min.xml
@@ -0,0 +1,3 @@
+<cpu match='minimum'>
+  <model>Penryn</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-penryn-force.xml b/tests/cputestdata/x86_64-penryn-force.xml
new file mode 100644 (file)
index 0000000..12fd274
--- /dev/null
+++ b/tests/cputestdata/x86_64-penryn-force.xml
@@ -0,0 +1,5 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='popcnt' policy='force'/>
+  <feature name='sse4.2' policy='force'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-pentium3-amd.xml b/tests/cputestdata/x86_64-pentium3-amd.xml
new file mode 100644 (file)
index 0000000..5fd73e4
--- /dev/null
+++ b/tests/cputestdata/x86_64-pentium3-amd.xml
@@ -0,0 +1,4 @@
+<cpu match='exact'>
+  <model>pentium3</model>
+  <vendor>AMD</vendor>
+</cpu>

diff --git a/tests/cputestdata/x86_64-pentium3.xml b/tests/cputestdata/x86_64-pentium3.xml
new file mode 100644 (file)
index 0000000..187e83d
--- /dev/null
+++ b/tests/cputestdata/x86_64-pentium3.xml
@@ -0,0 +1,3 @@
+<cpu match='minimum'>
+  <model>pentium3</model>
+</cpu>

diff --git a/tests/cputestdata/x86_64-strict-disable.xml b/tests/cputestdata/x86_64-strict-disable.xml
new file mode 100644 (file)
index 0000000..f2bac1a
--- /dev/null
+++ b/tests/cputestdata/x86_64-strict-disable.xml
@@ -0,0 +1,18 @@
+<cpu match='strict'>
+  <model>Penryn</model>
+  <feature name='dca' policy='require'/>
+  <feature name='xtpr' policy='require'/>
+  <feature name='tm2' policy='require'/>
+  <feature name='est' policy='require'/>
+  <feature name='vmx' policy='require'/>
+  <feature name='ds_cpl' policy='require'/>
+  <feature name='monitor' policy='disable'/>
+  <feature name='pbe' policy='require'/>
+  <feature name='tm' policy='require'/>
+  <feature name='ht' policy='require'/>
+  <feature name='ss' policy='disable'/>
+  <feature name='acpi' policy='require'/>
+  <feature name='ds' policy='require'/>
+  <feature name='vme' policy='require'/>
+  <feature name='3dnow' policy='disable'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-strict-force-extra.xml b/tests/cputestdata/x86_64-strict-force-extra.xml
new file mode 100644 (file)
index 0000000..dbae38c
--- /dev/null
+++ b/tests/cputestdata/x86_64-strict-force-extra.xml
@@ -0,0 +1,18 @@
+<cpu match='strict'>
+  <model>Penryn</model>
+  <feature name='dca' policy='require'/>
+  <feature name='xtpr' policy='require'/>
+  <feature name='tm2' policy='require'/>
+  <feature name='est' policy='require'/>
+  <feature name='vmx' policy='require'/>
+  <feature name='ds_cpl' policy='require'/>
+  <feature name='monitor' policy='require'/>
+  <feature name='pbe' policy='require'/>
+  <feature name='tm' policy='require'/>
+  <feature name='ht' policy='require'/>
+  <feature name='ss' policy='require'/>
+  <feature name='acpi' policy='require'/>
+  <feature name='ds' policy='require'/>
+  <feature name='vme' policy='require'/>
+  <feature name='3dnow' policy='force'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-strict-full.xml b/tests/cputestdata/x86_64-strict-full.xml
new file mode 100644 (file)
index 0000000..2dbe250
--- /dev/null
+++ b/tests/cputestdata/x86_64-strict-full.xml
@@ -0,0 +1,17 @@
+<cpu match='strict'>
+  <model>Penryn</model>
+  <feature name='dca' policy='require'/>
+  <feature name='xtpr' policy='require'/>
+  <feature name='tm2' policy='require'/>
+  <feature name='est' policy='require'/>
+  <feature name='vmx' policy='require'/>
+  <feature name='ds_cpl' policy='require'/>
+  <feature name='monitor' policy='require'/>
+  <feature name='pbe' policy='require'/>
+  <feature name='tm' policy='require'/>
+  <feature name='ht' policy='require'/>
+  <feature name='ss' policy='require'/>
+  <feature name='acpi' policy='require'/>
+  <feature name='ds' policy='require'/>
+  <feature name='vme' policy='require'/>
+</cpu>

diff --git a/tests/cputestdata/x86_64-strict.xml b/tests/cputestdata/x86_64-strict.xml
new file mode 100644 (file)
index 0000000..a64c262
--- /dev/null
+++ b/tests/cputestdata/x86_64-strict.xml
@@ -0,0 +1,3 @@
+<cpu match='strict'>
+  <model>Penryn</model>
+</cpu>