From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 20 Sep 2017 08:50:01 +0000 (+0200)
Subject: cputest: Update Xeon-E3-1245 data
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=29a16fb618ec477780a5080684a39f2caebd5652;p=libvirt.git

cputest: Update Xeon-E3-1245 data

xsaves is supported by current QEMU/KVM on this CPU.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml
index 1a177705a8..4a0477f788 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml
@@ -1,6 +1,5 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch='x86'>
   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml
index 2584042339..f31f7317b6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml
@@ -3,7 +3,7 @@
   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
   <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
   <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
   <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
index 7af75509e6..ad98679027 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
@@ -6,5 +6,6 @@
   <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-Xeon-E3-1245.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
index 4828da5884..bb5d7d8830 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
@@ -3,199 +3,238 @@
     "model": {
       "name": "base",
       "props": {
-        "pfthreshold": false,
-        "pku": false,
-        "rtm": true,
-        "tsc_adjust": true,
-        "tsc-deadline": true,
-        "xstore-en": false,
-        "tsc-scale": false,
-        "sse": true,
-        "smap": true,
-        "stepping": 3,
-        "tce": false,
-        "kvm_steal_time": true,
-        "smep": true,
+        "phys-bits": 0,
+        "core-id": -1,
+        "xlevel": 2147483656,
+        "cmov": true,
+        "ia64": false,
+        "aes": true,
+        "mmx": true,
+        "arat": true,
         "rdpid": false,
-        "xcrypt": false,
-        "sse4_2": true,
-        "monitor": false,
+        "pause-filter": false,
+        "xsavec": true,
+        "osxsave": false,
+        "tsc-frequency": 0,
+        "xd": true,
+        "hv-vendor-id": "",
+        "kvm-asyncpf": true,
+        "kvm_asyncpf": true,
+        "perfctr_core": false,
+        "perfctr-core": false,
+        "mpx": true,
+        "avx512cd": false,
+        "decodeassists": false,
+        "pbe": false,
         "sse4_1": true,
-        "kvm-mmu": false,
-        "flushbyasid": false,
-        "kvm-steal-time": true,
-        "lm": true,
-        "tsc": true,
-        "adx": true,
-        "fxsr": true,
-        "sha-ni": false,
-        "tm": false,
-        "pclmuldq": true,
-        "xgetbv1": true,
-        "xstore": false,
-        "vmcb_clean": false,
-        "vme": true,
-        "vendor": "GenuineIntel",
-        "arat": true,
-        "ffxsr": false,
-        "de": true,
+        "sse4.1": true,
+        "sse4-1": true,
+        "family": 6,
+        "vmware-cpuid-freq": true,
         "avx512f": false,
-        "pse": true,
-        "ds-cpl": false,
-        "tbm": false,
-        "ia64": false,
-        "phe-en": false,
-        "f16c": true,
+        "xcrypt": false,
+        "hv-runtime": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "thread-id": -1,
+        "min-level": 13,
+        "xgetbv1": true,
+        "cid": false,
+        "hv-relaxed": false,
+        "fxsr": true,
         "ds": false,
-        "mpx": true,
-        "tsc-adjust": true,
-        "aes": true,
-        "avx2": true,
-        "pbe": false,
-        "cx16": true,
-        "ds_cpl": false,
-        "movbe": true,
-        "perfctr-nb": false,
-        "nrip_save": false,
-        "kvm_mmu": false,
-        "ospke": false,
-        "avx512ifma": false,
-        "vmx": true,
-        "sep": true,
+        "hv-crash": false,
         "xsaveopt": true,
-        "sse4a": false,
-        "avx512dq": false,
-        "i64": true,
-        "avx512-4vnniw": false,
-        "xsave": true,
-        "erms": true,
+        "xtpr": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "avx512vl": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "cr8legacy": false,
+        "cpuid-0xb": true,
+        "xcrypt-en": false,
+        "kvm_pv_eoi": true,
+        "apic-id": 4294967295,
+        "pn": false,
+        "dca": false,
+        "vendor": "GenuineIntel",
+        "pku": false,
+        "smx": false,
+        "cmp-legacy": false,
+        "cmp_legacy": false,
+        "node-id": -1,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "vmcb_clean": false,
+        "3dnowext": false,
         "hle": true,
-        "nodeid_msr": false,
-        "est": false,
+        "npt": false,
+        "memory": "/machine/unattached/system[0]",
+        "clwb": false,
+        "lbrv": false,
+        "adx": true,
+        "ss": true,
+        "pni": true,
         "svm_lock": false,
-        "xop": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512er": false,
-        "sse4.1": true,
-        "sse4.2": true,
-        "pause-filter": false,
-        "lahf-lm": true,
+        "svm-lock": false,
+        "smep": true,
+        "pfthreshold": false,
+        "smap": true,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "hv-stimer": false,
+        "i64": true,
+        "flushbyasid": false,
+        "f16c": true,
+        "ace2-en": false,
+        "pat": true,
+        "pae": true,
+        "sse": true,
+        "phe-en": false,
         "kvm-nopiodelay": true,
-        "cmp_legacy": false,
-        "acpi": false,
-        "fma4": false,
-        "popcnt": true,
-        "mmx": true,
-        "osxsave": false,
+        "kvm_nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "hypervisor": true,
+        "socket-id": -1,
         "pcommit": false,
-        "avx512pf": false,
-        "clwb": false,
-        "dca": false,
-        "pdcm": false,
-        "xcrypt-en": false,
-        "3dnow": false,
+        "syscall": true,
+        "level": 13,
+        "avx512dq": false,
+        "svm": false,
+        "full-cpuid-auto-level": true,
+        "hv-reset": false,
         "invtsc": false,
+        "sse3": true,
+        "sse2": true,
+        "est": false,
+        "avx512ifma": false,
         "tm2": false,
-        "hypervisor": true,
-        "kvmclock-stable-bit": true,
-        "fxsr-opt": false,
-        "pcid": true,
-        "sse4-1": true,
+        "kvm-pv-eoi": true,
+        "cx8": true,
+        "kvm-mmu": false,
+        "kvm_mmu": false,
+        "sse4_2": true,
+        "sse4.2": true,
         "sse4-2": true,
-        "avx512-vpopcntdq": false,
-        "avx512-4fmaps": false,
-        "pause_filter": false,
-        "svm-lock": false,
-        "rdrand": true,
-        "nrip-save": false,
-        "avx512vl": false,
-        "x2apic": true,
-        "kvmclock": true,
         "pge": true,
-        "family": 6,
-        "dtes64": false,
-        "xd": true,
-        "kvm_pv_eoi": true,
-        "ace2": false,
+        "fill-mtrr-mask": true,
+        "pdcm": false,
+        "nodeid_msr": false,
+        "model": 94,
+        "movbe": true,
+        "nrip-save": false,
+        "nrip_save": false,
+        "sse4a": false,
+        "ssse3": true,
         "kvm_pv_unhalt": true,
-        "xtpr": false,
-        "perfctr_nb": false,
-        "avx512bw": false,
-        "nx": true,
-        "lwp": false,
-        "msr": true,
-        "ace2-en": false,
-        "decodeassists": false,
-        "perfctr-core": false,
-        "pn": false,
+        "invpcid": true,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
         "fma": true,
-        "nodeid-msr": false,
-        "kvm_asyncpf": true,
+        "cx16": true,
+        "de": true,
+        "enforce": false,
+        "stepping": 3,
+        "xsave": true,
         "clflush": true,
-        "cx8": true,
-        "mce": true,
-        "avx512cd": false,
-        "cr8legacy": false,
-        "mca": true,
-        "pni": true,
-        "rdseed": true,
-        "apic": true,
-        "fsgsbase": true,
-        "cmp-legacy": false,
-        "kvm-pv-unhalt": true,
-        "rdtscp": true,
-        "mmxext": false,
-        "cid": false,
-        "ssse3": true,
-        "extapic": false,
-        "pse36": true,
-        "mtrr": true,
+        "skinit": false,
+        "tce": false,
+        "tsc": true,
+        "fpu": true,
+        "ds-cpl": false,
+        "ds_cpl": false,
         "ibs": false,
+        "host-phys-bits": false,
+        "fma4": false,
         "la57": false,
+        "osvw": false,
+        "check": true,
+        "hv-spinlocks": -1,
+        "pmm": false,
+        "apic": true,
+        "pmu": false,
+        "min-xlevel2": 0,
+        "tsc-adjust": true,
+        "tsc_adjust": true,
+        "kvm-steal-time": true,
+        "kvm_steal_time": true,
+        "kvmclock": true,
+        "l3-cache": true,
+        "lwp": false,
+        "xop": false,
         "avx": true,
-        "syscall": true,
+        "ospke": false,
+        "ace2": false,
+        "acpi": false,
+        "avx512bw": false,
+        "hv-vapic": false,
+        "fsgsbase": true,
+        "ht": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": false,
+        "popcnt": true,
+        "xsaves": true,
+        "tcg-cpuid": true,
+        "lm": true,
         "umip": false,
-        "invpcid": true,
-        "avx512vbmi": false,
-        "kvm-asyncpf": true,
-        "vmcb-clean": false,
-        "pmm": false,
-        "cmov": true,
-        "perfctr_core": false,
+        "avx2": true,
+        "pse": true,
+        "sep": true,
+        "pclmuldq": true,
+        "nodeid-msr": false,
+        "kvm": true,
         "misalignsse": false,
-        "clflushopt": true,
-        "pat": true,
-        "lbrv": false,
-        "3dnowprefetch": true,
-        "fpu": true,
-        "pae": true,
-        "wdt": false,
+        "min-xlevel": 2147483656,
+        "bmi2": true,
+        "bmi1": true,
+        "kvm-pv-unhalt": true,
+        "realized": false,
         "tsc_scale": false,
-        "skinit": false,
-        "fxsr_opt": false,
-        "kvm_nopiodelay": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "hv-vpindex": false,
+        "xlevel2": 0,
+        "clflushopt": true,
+        "kvm-no-smi-migration": false,
+        "monitor": false,
+        "avx512er": false,
         "pmm-en": false,
-        "phe": false,
-        "3dnowext": false,
-        "osvw": false,
-        "ht": false,
-        "pdpe1gb": true,
-        "kvm-pv-eoi": true,
-        "npt": false,
-        "xsavec": true,
+        "pcid": true,
+        "3dnow": false,
+        "erms": true,
+        "lahf-lm": true,
         "lahf_lm": true,
-        "pclmulqdq": true,
-        "svm": false,
-        "sse3": true,
-        "sse2": true,
-        "ss": true,
-        "topoext": false,
-        "smx": false,
-        "bmi1": true,
-        "bmi2": true,
-        "xsaves": false,
-        "model": 94
+        "xstore": false,
+        "hv-synic": false,
+        "fxsr-opt": false,
+        "fxsr_opt": false,
+        "rtm": true,
+        "lmce": true,
+        "hv-time": false,
+        "perfctr-nb": false,
+        "perfctr_nb": false,
+        "ffxsr": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": true,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "pse36": true,
+        "tbm": false,
+        "wdt": false,
+        "pause_filter": false,
+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
+        "sha-ni": false,
+        "abm": true,
+        "avx512pf": false,
+        "xstore-en": false
       }
     }
   },
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
index 42992db7d9..f130a70f37 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
@@ -1,7 +1,7 @@
 <!-- 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='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x06100800' 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'/>
@@ -14,14 +14,15 @@
   <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='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000006'/>
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' 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='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' 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'/>