From 3b5dac0d87d09f41a7c8674d491b438d823224d7 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 1 Jun 2016 17:52:55 +0200
Subject: [PATCH] tests: Add CPU detection test for Intel Xeon W3520

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 tests/cputest.c                               |  1 +
 .../x86-cpuid-Xeon-W3520-guest.xml            | 23 ++++++
 .../cputestdata/x86-cpuid-Xeon-W3520-host.xml | 23 ++++++
 .../cputestdata/x86-cpuid-Xeon-W3520-json.xml | 10 +++
 tests/cputestdata/x86-cpuid-Xeon-W3520.json   | 77 +++++++++++++++++++
 tests/cputestdata/x86-cpuid-Xeon-W3520.xml    | 30 ++++++++
 6 files changed, 164 insertions(+)
 create mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml
 create mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml
 create mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
 create mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520.json
 create mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520.xml

diff --git a/tests/cputest.c b/tests/cputest.c
index 1d6f4053d2..ba606fd2b4 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -872,6 +872,7 @@ mymain(void)
     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);
 
 #if WITH_QEMU && WITH_YAJL
     qemuTestDriverFree(&driver);
diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml
new file mode 100644
index 0000000000..4037fa60cf
--- /dev/null
+++ b/tests/cputestdata/x86-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-cpuid-Xeon-W3520-host.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml
new file mode 100644
index 0000000000..c4a9226973
--- /dev/null
+++ b/tests/cputestdata/x86-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-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
new file mode 100644
index 0000000000..3292264153
--- /dev/null
+++ b/tests/cputestdata/x86-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='rdtscp'/>
+  <feature policy='require' name='tsc_adjust'/>
+</cpu>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520.json b/tests/cputestdata/x86-cpuid-Xeon-W3520.json
new file mode 100644
index 0000000000..c75594d4e6
--- /dev/null
+++ b/tests/cputestdata/x86-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-cpuid-Xeon-W3520.xml b/tests/cputestdata/x86-cpuid-Xeon-W3520.xml
new file mode 100644
index 0000000000..0d357f7162
--- /dev/null
+++ b/tests/cputestdata/x86-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>
-- 
GitLab