0a7476
From 2b9e257012ac32127e3269722a02d2ad7ff83cd4 Mon Sep 17 00:00:00 2001
0a7476
Message-Id: <2b9e257012ac32127e3269722a02d2ad7ff83cd4@dist-git>
bba56f
From: Jiri Denemark <jdenemar@redhat.com>
bba56f
Date: Thu, 21 Feb 2019 21:51:58 +0100
bba56f
Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) CPU E5-2630 v4
bba56f
MIME-Version: 1.0
bba56f
Content-Type: text/plain; charset=UTF-8
bba56f
Content-Transfer-Encoding: 8bit
bba56f
bba56f
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
bba56f
Reviewed-by: Ján Tomko <jtomko@redhat.com>
bba56f
(cherry picked from commit 8d068f360183ecd55e3213dbe9ba12f7d6470751)
bba56f
bba56f
https://bugzilla.redhat.com/show_bug.cgi?id=1558558
bba56f
https://bugzilla.redhat.com/show_bug.cgi?id=1687515
bba56f
bba56f
Conflicts:
bba56f
    tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
bba56f
    tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
bba56f
        - intel-pt feature does not exist in RHEL-7.6
bba56f
bba56f
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
bba56f
Reviewed-by: Ján Tomko <jtomko@redhat.com>
bba56f
---
bba56f
 tests/cputest.c                               |   1 +
bba56f
 .../x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml |   7 +
bba56f
 .../x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml  |   8 +
bba56f
 .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml    |  30 +
bba56f
 .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml     |  34 +
bba56f
 .../x86_64-cpuid-Xeon-E5-2630-v4-json.xml     |  11 +
bba56f
 .../x86_64-cpuid-Xeon-E5-2630-v4.json         | 596 ++++++++++++++++++
bba56f
 .../x86_64-cpuid-Xeon-E5-2630-v4.xml          |  43 ++
bba56f
 8 files changed, 730 insertions(+)
bba56f
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
bba56f
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml
bba56f
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
bba56f
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
bba56f
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
bba56f
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json
bba56f
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml
bba56f
bba56f
diff --git a/tests/cputest.c b/tests/cputest.c
bba56f
index baf2b3c648..8bb801859e 100644
bba56f
--- a/tests/cputest.c
bba56f
+++ b/tests/cputest.c
bba56f
@@ -1194,6 +1194,7 @@ mymain(void)
bba56f
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2609-v3", JSON_MODELS);
bba56f
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2623-v4", JSON_MODELS);
bba56f
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v3", JSON_HOST);
bba56f
+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v4", JSON_MODELS);
bba56f
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v3", JSON_HOST);
bba56f
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v4", JSON_MODELS);
bba56f
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST);
bba56f
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
bba56f
new file mode 100644
bba56f
index 0000000000..3ffb246167
bba56f
--- /dev/null
bba56f
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
bba56f
@@ -0,0 +1,7 @@
bba56f
+
bba56f
+<cpudata arch='x86'>
bba56f
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
bba56f
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
bba56f
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
bba56f
+</cpudata>
bba56f
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml
bba56f
new file mode 100644
bba56f
index 0000000000..f2d4f2826d
bba56f
--- /dev/null
bba56f
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml
bba56f
@@ -0,0 +1,8 @@
bba56f
+
bba56f
+<cpudata arch='x86'>
bba56f
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
bba56f
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x001c0fbb' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
bba56f
+</cpudata>
bba56f
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
bba56f
new file mode 100644
bba56f
index 0000000000..2fac54355c
bba56f
--- /dev/null
bba56f
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
bba56f
@@ -0,0 +1,30 @@
bba56f
+<cpu mode='custom' match='exact'>
bba56f
+  <model fallback='forbid'>Skylake-Client</model>
bba56f
+  <vendor>Intel</vendor>
bba56f
+  <feature policy='require' name='ds'/>
bba56f
+  <feature policy='require' name='acpi'/>
bba56f
+  <feature policy='require' name='ss'/>
bba56f
+  <feature policy='require' name='ht'/>
bba56f
+  <feature policy='require' name='tm'/>
bba56f
+  <feature policy='require' name='pbe'/>
bba56f
+  <feature policy='require' name='dtes64'/>
bba56f
+  <feature policy='require' name='monitor'/>
bba56f
+  <feature policy='require' name='ds_cpl'/>
bba56f
+  <feature policy='require' name='vmx'/>
bba56f
+  <feature policy='require' name='smx'/>
bba56f
+  <feature policy='require' name='est'/>
bba56f
+  <feature policy='require' name='tm2'/>
bba56f
+  <feature policy='require' name='xtpr'/>
bba56f
+  <feature policy='require' name='pdcm'/>
bba56f
+  <feature policy='require' name='dca'/>
bba56f
+  <feature policy='require' name='osxsave'/>
bba56f
+  <feature policy='require' name='tsc_adjust'/>
bba56f
+  <feature policy='require' name='cmt'/>
bba56f
+  <feature policy='require' name='mbm_total'/>
bba56f
+  <feature policy='require' name='mbm_local'/>
bba56f
+  <feature policy='require' name='pdpe1gb'/>
bba56f
+  <feature policy='require' name='invtsc'/>
bba56f
+  <feature policy='disable' name='mpx'/>
bba56f
+  <feature policy='disable' name='xsavec'/>
bba56f
+  <feature policy='disable' name='xgetbv1'/>
bba56f
+</cpu>
bba56f
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
bba56f
new file mode 100644
bba56f
index 0000000000..f482864a98
bba56f
--- /dev/null
bba56f
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
bba56f
@@ -0,0 +1,34 @@
bba56f
+<cpu>
bba56f
+  <arch>x86_64</arch>
bba56f
+  <model>Broadwell</model>
bba56f
+  <vendor>Intel</vendor>
bba56f
+  <feature name='vme'/>
bba56f
+  <feature name='ds'/>
bba56f
+  <feature name='acpi'/>
bba56f
+  <feature name='ss'/>
bba56f
+  <feature name='ht'/>
bba56f
+  <feature name='tm'/>
bba56f
+  <feature name='pbe'/>
bba56f
+  <feature name='dtes64'/>
bba56f
+  <feature name='monitor'/>
bba56f
+  <feature name='ds_cpl'/>
bba56f
+  <feature name='vmx'/>
bba56f
+  <feature name='smx'/>
bba56f
+  <feature name='est'/>
bba56f
+  <feature name='tm2'/>
bba56f
+  <feature name='xtpr'/>
bba56f
+  <feature name='pdcm'/>
bba56f
+  <feature name='dca'/>
bba56f
+  <feature name='osxsave'/>
bba56f
+  <feature name='f16c'/>
bba56f
+  <feature name='rdrand'/>
bba56f
+  <feature name='arat'/>
bba56f
+  <feature name='tsc_adjust'/>
bba56f
+  <feature name='cmt'/>
bba56f
+  <feature name='xsaveopt'/>
bba56f
+  <feature name='mbm_total'/>
bba56f
+  <feature name='mbm_local'/>
bba56f
+  <feature name='pdpe1gb'/>
bba56f
+  <feature name='abm'/>
bba56f
+  <feature name='invtsc'/>
bba56f
+</cpu>
bba56f
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
bba56f
new file mode 100644
bba56f
index 0000000000..5dfce947b2
bba56f
--- /dev/null
bba56f
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
bba56f
@@ -0,0 +1,11 @@
bba56f
+<cpu mode='custom' match='exact'>
bba56f
+  <model fallback='forbid'>Skylake-Client</model>
bba56f
+  <vendor>Intel</vendor>
bba56f
+  <feature policy='require' name='ss'/>
bba56f
+  <feature policy='require' name='hypervisor'/>
bba56f
+  <feature policy='require' name='tsc_adjust'/>
bba56f
+  <feature policy='require' name='pdpe1gb'/>
bba56f
+  <feature policy='disable' name='mpx'/>
bba56f
+  <feature policy='disable' name='xsavec'/>
bba56f
+  <feature policy='disable' name='xgetbv1'/>
bba56f
+</cpu>
bba56f
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json
bba56f
new file mode 100644
bba56f
index 0000000000..ee09950fce
bba56f
--- /dev/null
bba56f
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json
bba56f
@@ -0,0 +1,596 @@
bba56f
+{
bba56f
+  "return": {
bba56f
+    "model": {
bba56f
+      "name": "base",
bba56f
+      "props": {
bba56f
+        "phys-bits": 0,
bba56f
+        "core-id": -1,
bba56f
+        "xlevel": 2147483656,
bba56f
+        "cmov": true,
bba56f
+        "ia64": false,
bba56f
+        "aes": true,
bba56f
+        "mmx": true,
bba56f
+        "arat": true,
bba56f
+        "rdpid": false,
bba56f
+        "pause-filter": false,
bba56f
+        "xsavec": false,
bba56f
+        "osxsave": false,
bba56f
+        "tsc-frequency": 0,
bba56f
+        "xd": true,
bba56f
+        "hv-vendor-id": "",
bba56f
+        "kvm-asyncpf": true,
bba56f
+        "kvm_asyncpf": true,
bba56f
+        "perfctr_core": false,
bba56f
+        "perfctr-core": false,
bba56f
+        "mpx": false,
bba56f
+        "decodeassists": false,
bba56f
+        "avx512cd": false,
bba56f
+        "pbe": false,
bba56f
+        "sse4_1": true,
bba56f
+        "sse4.1": true,
bba56f
+        "sse4-1": true,
bba56f
+        "family": 6,
bba56f
+        "vmware-cpuid-freq": true,
bba56f
+        "avx512f": false,
bba56f
+        "xcrypt": false,
bba56f
+        "msr": true,
bba56f
+        "mce": true,
bba56f
+        "mca": true,
bba56f
+        "thread-id": -1,
bba56f
+        "min-level": 13,
bba56f
+        "xgetbv1": false,
bba56f
+        "cid": false,
bba56f
+        "hv-relaxed": false,
bba56f
+        "fxsr": true,
bba56f
+        "ds": false,
bba56f
+        "hv-crash": false,
bba56f
+        "xsaveopt": true,
bba56f
+        "xtpr": false,
bba56f
+        "avx512-vpopcntdq": false,
bba56f
+        "phe": false,
bba56f
+        "avx512vl": false,
bba56f
+        "extapic": false,
bba56f
+        "3dnowprefetch": true,
bba56f
+        "cr8legacy": false,
bba56f
+        "stibp": false,
bba56f
+        "cpuid-0xb": true,
bba56f
+        "xcrypt-en": false,
bba56f
+        "kvm_pv_eoi": true,
bba56f
+        "apic-id": 4294967295,
bba56f
+        "pn": false,
bba56f
+        "dca": false,
bba56f
+        "vendor": "GenuineIntel",
bba56f
+        "pku": false,
bba56f
+        "smx": false,
bba56f
+        "cmp-legacy": false,
bba56f
+        "cmp_legacy": false,
bba56f
+        "avx512-4fmaps": false,
bba56f
+        "vmcb-clean": false,
bba56f
+        "vmcb_clean": false,
bba56f
+        "3dnowext": false,
bba56f
+        "hle": true,
bba56f
+        "npt": false,
bba56f
+        "memory": "/machine/unattached/system[0]",
bba56f
+        "clwb": false,
bba56f
+        "lbrv": false,
bba56f
+        "adx": true,
bba56f
+        "ss": true,
bba56f
+        "pni": true,
bba56f
+        "svm_lock": false,
bba56f
+        "svm-lock": false,
bba56f
+        "smep": true,
bba56f
+        "pfthreshold": false,
bba56f
+        "smap": true,
bba56f
+        "x2apic": true,
bba56f
+        "avx512vbmi": false,
bba56f
+        "i64": true,
bba56f
+        "flushbyasid": false,
bba56f
+        "f16c": true,
bba56f
+        "ace2-en": false,
bba56f
+        "pat": true,
bba56f
+        "pae": true,
bba56f
+        "sse": true,
bba56f
+        "phe-en": false,
bba56f
+        "kvm-nopiodelay": true,
bba56f
+        "kvm_nopiodelay": true,
bba56f
+        "tm": false,
bba56f
+        "kvmclock-stable-bit": true,
bba56f
+        "hypervisor": true,
bba56f
+        "socket-id": -1,
bba56f
+        "pcommit": false,
bba56f
+        "syscall": true,
bba56f
+        "level": 13,
bba56f
+        "avx512dq": false,
bba56f
+        "svm": false,
bba56f
+        "full-cpuid-auto-level": true,
bba56f
+        "invtsc": false,
bba56f
+        "sse3": true,
bba56f
+        "sse2": true,
bba56f
+        "est": false,
bba56f
+        "avx512ifma": false,
bba56f
+        "tm2": false,
bba56f
+        "kvm-pv-eoi": true,
bba56f
+        "cx8": true,
bba56f
+        "kvm-mmu": false,
bba56f
+        "kvm_mmu": false,
bba56f
+        "sse4_2": true,
bba56f
+        "sse4.2": true,
bba56f
+        "sse4-2": true,
bba56f
+        "pge": true,
bba56f
+        "fill-mtrr-mask": true,
bba56f
+        "pdcm": false,
bba56f
+        "nodeid_msr": false,
bba56f
+        "model": 79,
bba56f
+        "movbe": true,
bba56f
+        "nrip-save": false,
bba56f
+        "nrip_save": false,
bba56f
+        "sse4a": false,
bba56f
+        "ssse3": true,
bba56f
+        "kvm_pv_unhalt": true,
bba56f
+        "invpcid": true,
bba56f
+        "pdpe1gb": true,
bba56f
+        "tsc-deadline": true,
bba56f
+        "fma": true,
bba56f
+        "cx16": true,
bba56f
+        "de": true,
bba56f
+        "enforce": false,
bba56f
+        "stepping": 1,
bba56f
+        "xsave": true,
bba56f
+        "clflush": true,
bba56f
+        "arch-facilities": false,
bba56f
+        "skinit": false,
bba56f
+        "tce": false,
bba56f
+        "tsc": true,
bba56f
+        "fpu": true,
bba56f
+        "ds-cpl": false,
bba56f
+        "ds_cpl": false,
bba56f
+        "ibs": false,
bba56f
+        "host-phys-bits": true,
bba56f
+        "fma4": false,
bba56f
+        "la57": false,
bba56f
+        "osvw": false,
bba56f
+        "check": true,
bba56f
+        "hv-spinlocks": -1,
bba56f
+        "pmm": false,
bba56f
+        "apic": true,
bba56f
+        "pmu": false,
bba56f
+        "spec-ctrl": false,
bba56f
+        "min-xlevel2": 0,
bba56f
+        "tsc-adjust": true,
bba56f
+        "tsc_adjust": true,
bba56f
+        "kvm-steal-time": true,
bba56f
+        "kvm_steal_time": true,
bba56f
+        "kvmclock": true,
bba56f
+        "l3-cache": true,
bba56f
+        "lwp": false,
bba56f
+        "xop": false,
bba56f
+        "ibpb": false,
bba56f
+        "avx": true,
bba56f
+        "ospke": false,
bba56f
+        "ace2": false,
bba56f
+        "acpi": false,
bba56f
+        "avx512bw": false,
bba56f
+        "hv-vapic": false,
bba56f
+        "fsgsbase": true,
bba56f
+        "ht": false,
bba56f
+        "nx": true,
bba56f
+        "pclmulqdq": true,
bba56f
+        "mmxext": false,
bba56f
+        "popcnt": true,
bba56f
+        "xsaves": false,
bba56f
+        "lm": true,
bba56f
+        "umip": false,
bba56f
+        "avx2": true,
bba56f
+        "pse": true,
bba56f
+        "sep": true,
bba56f
+        "pclmuldq": true,
bba56f
+        "nodeid-msr": false,
bba56f
+        "kvm": true,
bba56f
+        "misalignsse": false,
bba56f
+        "min-xlevel": 2147483656,
bba56f
+        "bmi2": true,
bba56f
+        "bmi1": true,
bba56f
+        "kvm-pv-unhalt": true,
bba56f
+        "realized": false,
bba56f
+        "tsc-scale": false,
bba56f
+        "tsc_scale": false,
bba56f
+        "topoext": false,
bba56f
+        "xlevel2": 0,
bba56f
+        "clflushopt": false,
bba56f
+        "kvm-no-smi-migration": false,
bba56f
+        "monitor": false,
bba56f
+        "avx512er": false,
bba56f
+        "pmm-en": false,
bba56f
+        "pcid": true,
bba56f
+        "3dnow": false,
bba56f
+        "erms": true,
bba56f
+        "lahf-lm": true,
bba56f
+        "lahf_lm": true,
bba56f
+        "xstore": false,
bba56f
+        "fxsr-opt": false,
bba56f
+        "fxsr_opt": false,
bba56f
+        "rtm": true,
bba56f
+        "lmce": true,
bba56f
+        "hv-time": false,
bba56f
+        "perfctr-nb": false,
bba56f
+        "perfctr_nb": false,
bba56f
+        "ffxsr": false,
bba56f
+        "rdrand": true,
bba56f
+        "rdseed": true,
bba56f
+        "avx512-4vnniw": false,
bba56f
+        "vme": true,
bba56f
+        "vmx": false,
bba56f
+        "dtes64": false,
bba56f
+        "mtrr": true,
bba56f
+        "rdtscp": true,
bba56f
+        "pse36": true,
bba56f
+        "tbm": false,
bba56f
+        "wdt": false,
bba56f
+        "pause_filter": false,
bba56f
+        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz",
bba56f
+        "sha-ni": false,
bba56f
+        "abm": true,
bba56f
+        "avx512pf": false,
bba56f
+        "xstore-en": false
bba56f
+      }
bba56f
+    }
bba56f
+  },
bba56f
+  "id": "model-expansion"
bba56f
+}
bba56f
+
bba56f
+
bba56f
+{
bba56f
+  "return": [
bba56f
+    {
bba56f
+      "name": "max",
bba56f
+      "typename": "max-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": false
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "host",
bba56f
+      "typename": "host-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": false
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "base",
bba56f
+      "typename": "base-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": true,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "qemu64",
bba56f
+      "typename": "qemu64-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "qemu32",
bba56f
+      "typename": "qemu32-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "phenom",
bba56f
+      "typename": "phenom-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "mmxext",
bba56f
+        "fxsr-opt",
bba56f
+        "3dnowext",
bba56f
+        "3dnow",
bba56f
+        "sse4a",
bba56f
+        "npt"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "pentium3",
bba56f
+      "typename": "pentium3-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "pentium2",
bba56f
+      "typename": "pentium2-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "pentium",
bba56f
+      "typename": "pentium-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "n270",
bba56f
+      "typename": "n270-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "kvm64",
bba56f
+      "typename": "kvm64-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "kvm32",
bba56f
+      "typename": "kvm32-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "cpu64-rhel6",
bba56f
+      "typename": "cpu64-rhel6-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "sse4a"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "coreduo",
bba56f
+      "typename": "coreduo-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "core2duo",
bba56f
+      "typename": "core2duo-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "athlon",
bba56f
+      "typename": "athlon-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "mmxext",
bba56f
+        "3dnowext",
bba56f
+        "3dnow"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Westmere",
bba56f
+      "typename": "Westmere-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Westmere-IBRS",
bba56f
+      "typename": "Westmere-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Skylake-Client",
bba56f
+      "typename": "Skylake-Client-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "mpx",
bba56f
+        "xsavec",
bba56f
+        "xgetbv1",
bba56f
+        "mpx",
bba56f
+        "mpx"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Skylake-Client-IBRS",
bba56f
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "mpx",
bba56f
+        "spec-ctrl",
bba56f
+        "xsavec",
bba56f
+        "xgetbv1",
bba56f
+        "mpx",
bba56f
+        "mpx"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "SandyBridge",
bba56f
+      "typename": "SandyBridge-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "SandyBridge-IBRS",
bba56f
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Penryn",
bba56f
+      "typename": "Penryn-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Opteron_G5",
bba56f
+      "typename": "Opteron_G5-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "sse4a",
bba56f
+        "misalignsse",
bba56f
+        "xop",
bba56f
+        "fma4",
bba56f
+        "tbm"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Opteron_G4",
bba56f
+      "typename": "Opteron_G4-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "sse4a",
bba56f
+        "misalignsse",
bba56f
+        "xop",
bba56f
+        "fma4"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Opteron_G3",
bba56f
+      "typename": "Opteron_G3-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "sse4a",
bba56f
+        "misalignsse"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Opteron_G2",
bba56f
+      "typename": "Opteron_G2-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Opteron_G1",
bba56f
+      "typename": "Opteron_G1-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Nehalem",
bba56f
+      "typename": "Nehalem-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Nehalem-IBRS",
bba56f
+      "typename": "Nehalem-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "IvyBridge",
bba56f
+      "typename": "IvyBridge-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "IvyBridge-IBRS",
bba56f
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Haswell",
bba56f
+      "typename": "Haswell-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Haswell-noTSX",
bba56f
+      "typename": "Haswell-noTSX-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Haswell-noTSX-IBRS",
bba56f
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Haswell-IBRS",
bba56f
+      "typename": "Haswell-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Conroe",
bba56f
+      "typename": "Conroe-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Broadwell",
bba56f
+      "typename": "Broadwell-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Broadwell-noTSX",
bba56f
+      "typename": "Broadwell-noTSX-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Broadwell-noTSX-IBRS",
bba56f
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "Broadwell-IBRS",
bba56f
+      "typename": "Broadwell-IBRS-x86_64-cpu",
bba56f
+      "unavailable-features": [
bba56f
+        "spec-ctrl"
bba56f
+      ],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    },
bba56f
+    {
bba56f
+      "name": "486",
bba56f
+      "typename": "486-x86_64-cpu",
bba56f
+      "unavailable-features": [],
bba56f
+      "static": false,
bba56f
+      "migration-safe": true
bba56f
+    }
bba56f
+  ],
bba56f
+  "id": "definitions"
bba56f
+}
bba56f
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml
bba56f
new file mode 100644
bba56f
index 0000000000..d74c207104
bba56f
--- /dev/null
bba56f
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml
bba56f
@@ -0,0 +1,43 @@
bba56f
+
bba56f
+<cpudata arch='x86'>
bba56f
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000014' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
bba56f
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000406f1' ebx='0x01200800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
bba56f
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
bba56f
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x04c0003f' ecx='0x00004fff' edx='0x00000006'/>
bba56f
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002120'/>
bba56f
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x021cbfbb' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
bba56f
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000001'/>
bba56f
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x00000014' ecx='0x00000201' edx='0x00000001'/>
bba56f
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000004f' ecx='0x00000000' edx='0x00000002'/>
bba56f
+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x0000a000' ecx='0x0000004f' edx='0x00000007'/>
bba56f
+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x00000013' ebx='0x000c0000' ecx='0x00000004' edx='0x0000000f'/>
bba56f
+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
bba56f
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
bba56f
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d354520' ecx='0x30333632' edx='0x20347620'/>
bba56f
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e322040' ebx='0x48473032' ecx='0x0000007a' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
bba56f
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
bba56f
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
bba56f
+</cpudata>
bba56f
-- 
bba56f
2.21.0
bba56f