0a7476
From 21665cdbf25ce849c08d0c56a44f1483682cd745 Mon Sep 17 00:00:00 2001
0a7476
Message-Id: <21665cdbf25ce849c08d0c56a44f1483682cd745@dist-git>
072c97
From: Jiri Denemark <jdenemar@redhat.com>
072c97
Date: Fri, 5 Apr 2019 11:19:30 +0200
072c97
Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) CPU E3-1225 v5
0a7476
MIME-Version: 1.0
0a7476
Content-Type: text/plain; charset=UTF-8
0a7476
Content-Transfer-Encoding: 8bit
072c97
072c97
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
0a7476
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
0a7476
(cherry picked from commit 5cd9db3ac11e88846cbcf95fad9f6fae9d880dee)
072c97
0a7476
CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
072c97
072c97
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
072c97
---
072c97
 tests/cputest.c                               |   1 +
072c97
 .../x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml |   7 +
072c97
 .../x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml  |   8 +
0a7476
 .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  28 +
0a7476
 .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  29 +
072c97
 .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml     |  11 +
072c97
 .../x86_64-cpuid-Xeon-E3-1225-v5.json         | 652 ++++++++++++++++++
072c97
 .../x86_64-cpuid-Xeon-E3-1225-v5.sig          |   4 +
072c97
 .../x86_64-cpuid-Xeon-E3-1225-v5.xml          |  47 ++
0a7476
 9 files changed, 787 insertions(+)
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
072c97
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
072c97
072c97
diff --git a/tests/cputest.c b/tests/cputest.c
072c97
index 74f84fab6c..9e5f807823 100644
072c97
--- a/tests/cputest.c
072c97
+++ b/tests/cputest.c
072c97
@@ -1192,6 +1192,7 @@ mymain(void)
072c97
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST);
072c97
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST);
072c97
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE);
072c97
+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1225-v5", JSON_MODELS);
072c97
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS);
072c97
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2609-v3", JSON_MODELS);
072c97
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2623-v4", JSON_MODELS);
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
072c97
new file mode 100644
072c97
index 0000000000..ce51903e53
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
072c97
@@ -0,0 +1,7 @@
072c97
+
072c97
+<cpudata arch='x86'>
072c97
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
072c97
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
072c97
+</cpudata>
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
072c97
new file mode 100644
072c97
index 0000000000..0deca9fba6
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
072c97
@@ -0,0 +1,8 @@
072c97
+
072c97
+<cpudata arch='x86'>
072c97
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
072c97
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
072c97
+</cpudata>
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
072c97
new file mode 100644
0a7476
index 0000000000..70a0fc3286
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
0a7476
@@ -0,0 +1,28 @@
072c97
+<cpu mode='custom' match='exact'>
072c97
+  <model fallback='forbid'>Skylake-Client-IBRS</model>
072c97
+  <vendor>Intel</vendor>
072c97
+  <feature policy='require' name='ds'/>
072c97
+  <feature policy='require' name='acpi'/>
072c97
+  <feature policy='require' name='ss'/>
072c97
+  <feature policy='require' name='ht'/>
072c97
+  <feature policy='require' name='tm'/>
072c97
+  <feature policy='require' name='pbe'/>
072c97
+  <feature policy='require' name='dtes64'/>
072c97
+  <feature policy='require' name='monitor'/>
072c97
+  <feature policy='require' name='ds_cpl'/>
072c97
+  <feature policy='require' name='vmx'/>
072c97
+  <feature policy='require' name='smx'/>
072c97
+  <feature policy='require' name='est'/>
072c97
+  <feature policy='require' name='tm2'/>
072c97
+  <feature policy='require' name='xtpr'/>
072c97
+  <feature policy='require' name='pdcm'/>
072c97
+  <feature policy='require' name='osxsave'/>
072c97
+  <feature policy='require' name='tsc_adjust'/>
072c97
+  <feature policy='require' name='clflushopt'/>
0a7476
+  <feature policy='require' name='intel-pt'/>
072c97
+  <feature policy='require' name='stibp'/>
072c97
+  <feature policy='require' name='ssbd'/>
072c97
+  <feature policy='require' name='xsaves'/>
072c97
+  <feature policy='require' name='pdpe1gb'/>
072c97
+  <feature policy='require' name='invtsc'/>
072c97
+</cpu>
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
072c97
new file mode 100644
0a7476
index 0000000000..bbdfb6aa61
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
0a7476
@@ -0,0 +1,29 @@
072c97
+<cpu>
072c97
+  <arch>x86_64</arch>
072c97
+  <model>Skylake-Client-IBRS</model>
072c97
+  <vendor>Intel</vendor>
072c97
+  <feature name='ds'/>
072c97
+  <feature name='acpi'/>
072c97
+  <feature name='ss'/>
072c97
+  <feature name='ht'/>
072c97
+  <feature name='tm'/>
072c97
+  <feature name='pbe'/>
072c97
+  <feature name='dtes64'/>
072c97
+  <feature name='monitor'/>
072c97
+  <feature name='ds_cpl'/>
072c97
+  <feature name='vmx'/>
072c97
+  <feature name='smx'/>
072c97
+  <feature name='est'/>
072c97
+  <feature name='tm2'/>
072c97
+  <feature name='xtpr'/>
072c97
+  <feature name='pdcm'/>
072c97
+  <feature name='osxsave'/>
072c97
+  <feature name='tsc_adjust'/>
072c97
+  <feature name='clflushopt'/>
0a7476
+  <feature name='intel-pt'/>
072c97
+  <feature name='stibp'/>
072c97
+  <feature name='ssbd'/>
072c97
+  <feature name='xsaves'/>
072c97
+  <feature name='pdpe1gb'/>
072c97
+  <feature name='invtsc'/>
072c97
+</cpu>
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
072c97
new file mode 100644
072c97
index 0000000000..1f321db273
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
072c97
@@ -0,0 +1,11 @@
072c97
+<cpu mode='custom' match='exact'>
072c97
+  <model fallback='forbid'>Skylake-Client-IBRS</model>
072c97
+  <vendor>Intel</vendor>
072c97
+  <feature policy='require' name='ss'/>
072c97
+  <feature policy='require' name='hypervisor'/>
072c97
+  <feature policy='require' name='tsc_adjust'/>
072c97
+  <feature policy='require' name='clflushopt'/>
072c97
+  <feature policy='require' name='stibp'/>
072c97
+  <feature policy='require' name='ssbd'/>
072c97
+  <feature policy='require' name='pdpe1gb'/>
072c97
+</cpu>
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
072c97
new file mode 100644
072c97
index 0000000000..084747556b
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
072c97
@@ -0,0 +1,652 @@
072c97
+{
072c97
+  "return": {
072c97
+    "model": {
072c97
+      "name": "base",
072c97
+      "props": {
072c97
+        "phys-bits": 0,
072c97
+        "core-id": -1,
072c97
+        "xlevel": 2147483656,
072c97
+        "cmov": true,
072c97
+        "ia64": false,
072c97
+        "aes": true,
072c97
+        "mmx": true,
072c97
+        "rdpid": false,
072c97
+        "arat": true,
072c97
+        "gfni": false,
072c97
+        "pause-filter": false,
072c97
+        "xsavec": true,
072c97
+        "intel-pt": false,
072c97
+        "osxsave": false,
072c97
+        "hv-frequencies": false,
072c97
+        "tsc-frequency": 0,
072c97
+        "xd": true,
072c97
+        "hv-vendor-id": "",
072c97
+        "kvm-asyncpf": true,
072c97
+        "kvm_asyncpf": true,
072c97
+        "perfctr_core": false,
072c97
+        "perfctr-core": false,
072c97
+        "mpx": true,
072c97
+        "pbe": false,
072c97
+        "decodeassists": false,
072c97
+        "avx512cd": false,
072c97
+        "sse4_1": true,
072c97
+        "sse4.1": true,
072c97
+        "sse4-1": true,
072c97
+        "family": 6,
072c97
+        "legacy-cache": true,
072c97
+        "vmware-cpuid-freq": true,
072c97
+        "avx512f": false,
072c97
+        "msr": true,
072c97
+        "mce": true,
072c97
+        "mca": true,
072c97
+        "hv-runtime": false,
072c97
+        "xcrypt": false,
072c97
+        "thread-id": -1,
072c97
+        "min-level": 13,
072c97
+        "xgetbv1": true,
072c97
+        "cid": false,
072c97
+        "hv-relaxed": false,
072c97
+        "hv-crash": false,
072c97
+        "ds": false,
072c97
+        "fxsr": true,
072c97
+        "xsaveopt": true,
072c97
+        "xtpr": false,
072c97
+        "avx512vl": false,
072c97
+        "avx512-vpopcntdq": false,
072c97
+        "phe": false,
072c97
+        "extapic": false,
072c97
+        "3dnowprefetch": true,
072c97
+        "avx512vbmi2": false,
072c97
+        "cr8legacy": false,
072c97
+        "stibp": true,
072c97
+        "cpuid-0xb": true,
072c97
+        "xcrypt-en": false,
072c97
+        "kvm_pv_eoi": true,
072c97
+        "apic-id": 4294967295,
072c97
+        "pn": false,
072c97
+        "dca": false,
072c97
+        "vendor": "GenuineIntel",
072c97
+        "pku": false,
072c97
+        "smx": false,
072c97
+        "cmp_legacy": false,
072c97
+        "cmp-legacy": false,
072c97
+        "node-id": -1,
072c97
+        "avx512-4fmaps": false,
072c97
+        "vmcb_clean": false,
072c97
+        "vmcb-clean": false,
072c97
+        "3dnowext": false,
072c97
+        "hle": true,
072c97
+        "npt": false,
072c97
+        "memory": "/machine/unattached/system[0]",
072c97
+        "clwb": false,
072c97
+        "lbrv": false,
072c97
+        "adx": true,
072c97
+        "ss": true,
072c97
+        "pni": true,
072c97
+        "svm_lock": false,
072c97
+        "svm-lock": false,
072c97
+        "pfthreshold": false,
072c97
+        "smep": true,
072c97
+        "smap": true,
072c97
+        "x2apic": true,
072c97
+        "avx512vbmi": false,
072c97
+        "avx512vnni": false,
072c97
+        "hv-stimer": false,
072c97
+        "i64": true,
072c97
+        "flushbyasid": false,
072c97
+        "f16c": true,
072c97
+        "ace2-en": false,
072c97
+        "pat": true,
072c97
+        "pae": true,
072c97
+        "sse": true,
072c97
+        "phe-en": false,
072c97
+        "kvm_nopiodelay": true,
072c97
+        "kvm-nopiodelay": true,
072c97
+        "tm": false,
072c97
+        "kvmclock-stable-bit": true,
072c97
+        "hypervisor": true,
072c97
+        "socket-id": -1,
072c97
+        "pcommit": false,
072c97
+        "syscall": true,
072c97
+        "level": 13,
072c97
+        "avx512dq": false,
072c97
+        "svm": false,
072c97
+        "full-cpuid-auto-level": true,
072c97
+        "hv-reset": false,
072c97
+        "invtsc": false,
072c97
+        "sse3": true,
072c97
+        "sse2": true,
072c97
+        "ssbd": true,
072c97
+        "est": false,
072c97
+        "avx512ifma": false,
072c97
+        "tm2": false,
072c97
+        "kvm-pv-eoi": true,
072c97
+        "cx8": true,
072c97
+        "kvm_mmu": false,
072c97
+        "kvm-mmu": false,
072c97
+        "sse4_2": true,
072c97
+        "sse4.2": true,
072c97
+        "sse4-2": true,
072c97
+        "pge": true,
072c97
+        "fill-mtrr-mask": true,
072c97
+        "avx512bitalg": false,
072c97
+        "nodeid_msr": false,
072c97
+        "pdcm": false,
072c97
+        "movbe": true,
072c97
+        "model": 94,
072c97
+        "nrip_save": false,
072c97
+        "nrip-save": false,
072c97
+        "kvm_pv_unhalt": true,
072c97
+        "ssse3": true,
072c97
+        "sse4a": false,
072c97
+        "invpcid": true,
072c97
+        "pdpe1gb": true,
072c97
+        "tsc-deadline": true,
072c97
+        "fma": true,
072c97
+        "cx16": true,
072c97
+        "de": true,
072c97
+        "enforce": false,
072c97
+        "stepping": 3,
072c97
+        "xsave": true,
072c97
+        "clflush": true,
072c97
+        "skinit": false,
072c97
+        "tsc": true,
072c97
+        "tce": false,
072c97
+        "fpu": true,
072c97
+        "ibs": false,
072c97
+        "ds_cpl": false,
072c97
+        "ds-cpl": false,
072c97
+        "host-phys-bits": true,
072c97
+        "fma4": false,
072c97
+        "la57": false,
072c97
+        "osvw": false,
072c97
+        "check": true,
072c97
+        "hv-spinlocks": -1,
072c97
+        "pmu": false,
072c97
+        "pmm": false,
072c97
+        "apic": true,
072c97
+        "spec-ctrl": true,
072c97
+        "min-xlevel2": 0,
072c97
+        "tsc-adjust": true,
072c97
+        "tsc_adjust": true,
072c97
+        "kvm-steal-time": true,
072c97
+        "kvm_steal_time": true,
072c97
+        "kvmclock": true,
072c97
+        "l3-cache": true,
072c97
+        "lwp": false,
072c97
+        "ibpb": false,
072c97
+        "xop": false,
072c97
+        "avx": true,
072c97
+        "ospke": false,
072c97
+        "ace2": false,
072c97
+        "avx512bw": false,
072c97
+        "acpi": false,
072c97
+        "hv-vapic": false,
072c97
+        "fsgsbase": true,
072c97
+        "ht": false,
072c97
+        "nx": true,
072c97
+        "pclmulqdq": true,
072c97
+        "mmxext": false,
072c97
+        "vaes": false,
072c97
+        "popcnt": true,
072c97
+        "xsaves": false,
072c97
+        "tcg-cpuid": true,
072c97
+        "lm": true,
072c97
+        "umip": false,
072c97
+        "pse": true,
072c97
+        "avx2": true,
072c97
+        "sep": true,
072c97
+        "pclmuldq": true,
072c97
+        "virt-ssbd": false,
072c97
+        "x-hv-max-vps": -1,
072c97
+        "nodeid-msr": false,
072c97
+        "md-clear": true,
072c97
+        "kvm": true,
072c97
+        "misalignsse": false,
072c97
+        "min-xlevel": 2147483656,
072c97
+        "kvm-pv-unhalt": true,
072c97
+        "bmi2": true,
072c97
+        "bmi1": true,
072c97
+        "realized": false,
072c97
+        "tsc_scale": false,
072c97
+        "tsc-scale": false,
072c97
+        "topoext": false,
072c97
+        "hv-vpindex": false,
072c97
+        "xlevel2": 0,
072c97
+        "clflushopt": true,
072c97
+        "kvm-no-smi-migration": false,
072c97
+        "monitor": false,
072c97
+        "avx512er": false,
072c97
+        "pmm-en": false,
072c97
+        "pcid": true,
072c97
+        "3dnow": false,
072c97
+        "erms": true,
072c97
+        "lahf-lm": true,
072c97
+        "lahf_lm": true,
072c97
+        "vpclmulqdq": false,
072c97
+        "fxsr-opt": false,
072c97
+        "hv-synic": false,
072c97
+        "xstore": false,
072c97
+        "fxsr_opt": false,
072c97
+        "kvm-hint-dedicated": false,
072c97
+        "rtm": true,
072c97
+        "lmce": true,
072c97
+        "hv-time": false,
072c97
+        "perfctr-nb": false,
072c97
+        "perfctr_nb": false,
072c97
+        "ffxsr": false,
072c97
+        "rdrand": true,
072c97
+        "rdseed": true,
072c97
+        "avx512-4vnniw": false,
072c97
+        "vmx": false,
072c97
+        "vme": true,
072c97
+        "dtes64": false,
072c97
+        "mtrr": true,
072c97
+        "rdtscp": true,
072c97
+        "pse36": true,
072c97
+        "kvm-pv-tlb-flush": false,
072c97
+        "tbm": false,
072c97
+        "wdt": false,
072c97
+        "pause_filter": false,
072c97
+        "sha-ni": false,
072c97
+        "model-id": "Intel(R) Xeon(R) CPU E3-1225 v5 @ 3.30GHz",
072c97
+        "abm": true,
072c97
+        "avx512pf": false,
072c97
+        "xstore-en": false
072c97
+      }
072c97
+    }
072c97
+  },
072c97
+  "id": "model-expansion"
072c97
+}
072c97
+
072c97
+{
072c97
+  "return": [
072c97
+    {
072c97
+      "name": "max",
072c97
+      "typename": "max-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": false
072c97
+    },
072c97
+    {
072c97
+      "name": "host",
072c97
+      "typename": "host-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": false
072c97
+    },
072c97
+    {
072c97
+      "name": "base",
072c97
+      "typename": "base-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": true,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "qemu64",
072c97
+      "typename": "qemu64-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "qemu32",
072c97
+      "typename": "qemu32-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "phenom",
072c97
+      "typename": "phenom-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "mmxext",
072c97
+        "fxsr-opt",
072c97
+        "3dnowext",
072c97
+        "3dnow",
072c97
+        "sse4a",
072c97
+        "npt"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "pentium3",
072c97
+      "typename": "pentium3-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "pentium2",
072c97
+      "typename": "pentium2-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "pentium",
072c97
+      "typename": "pentium-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "n270",
072c97
+      "typename": "n270-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "kvm64",
072c97
+      "typename": "kvm64-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "kvm32",
072c97
+      "typename": "kvm32-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "cpu64-rhel6",
072c97
+      "typename": "cpu64-rhel6-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "sse4a"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "coreduo",
072c97
+      "typename": "coreduo-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "core2duo",
072c97
+      "typename": "core2duo-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "athlon",
072c97
+      "typename": "athlon-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "mmxext",
072c97
+        "3dnowext",
072c97
+        "3dnow"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Westmere",
072c97
+      "typename": "Westmere-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Westmere-IBRS",
072c97
+      "typename": "Westmere-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Skylake-Server",
072c97
+      "typename": "Skylake-Server-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "avx512f",
072c97
+        "avx512dq",
072c97
+        "clwb",
072c97
+        "avx512cd",
072c97
+        "avx512bw",
072c97
+        "avx512vl",
072c97
+        "avx512f",
072c97
+        "avx512f",
072c97
+        "avx512f"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Skylake-Server-IBRS",
072c97
+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "avx512f",
072c97
+        "avx512dq",
072c97
+        "clwb",
072c97
+        "avx512cd",
072c97
+        "avx512bw",
072c97
+        "avx512vl",
072c97
+        "avx512f",
072c97
+        "avx512f",
072c97
+        "avx512f"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Skylake-Client",
072c97
+      "typename": "Skylake-Client-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Skylake-Client-IBRS",
072c97
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "SandyBridge",
072c97
+      "typename": "SandyBridge-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "SandyBridge-IBRS",
072c97
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Penryn",
072c97
+      "typename": "Penryn-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Opteron_G5",
072c97
+      "typename": "Opteron_G5-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "sse4a",
072c97
+        "misalignsse",
072c97
+        "xop",
072c97
+        "fma4",
072c97
+        "tbm"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Opteron_G4",
072c97
+      "typename": "Opteron_G4-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "sse4a",
072c97
+        "misalignsse",
072c97
+        "xop",
072c97
+        "fma4"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Opteron_G3",
072c97
+      "typename": "Opteron_G3-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "sse4a",
072c97
+        "misalignsse"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Opteron_G2",
072c97
+      "typename": "Opteron_G2-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Opteron_G1",
072c97
+      "typename": "Opteron_G1-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Nehalem",
072c97
+      "typename": "Nehalem-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Nehalem-IBRS",
072c97
+      "typename": "Nehalem-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "IvyBridge",
072c97
+      "typename": "IvyBridge-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "IvyBridge-IBRS",
072c97
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Haswell",
072c97
+      "typename": "Haswell-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Haswell-noTSX",
072c97
+      "typename": "Haswell-noTSX-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Haswell-noTSX-IBRS",
072c97
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Haswell-IBRS",
072c97
+      "typename": "Haswell-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "EPYC",
072c97
+      "typename": "EPYC-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "sha-ni",
072c97
+        "mmxext",
072c97
+        "fxsr-opt",
072c97
+        "cr8legacy",
072c97
+        "sse4a",
072c97
+        "misalignsse",
072c97
+        "osvw"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "EPYC-IBPB",
072c97
+      "typename": "EPYC-IBPB-x86_64-cpu",
072c97
+      "unavailable-features": [
072c97
+        "sha-ni",
072c97
+        "mmxext",
072c97
+        "fxsr-opt",
072c97
+        "cr8legacy",
072c97
+        "sse4a",
072c97
+        "misalignsse",
072c97
+        "osvw",
072c97
+        "ibpb"
072c97
+      ],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Conroe",
072c97
+      "typename": "Conroe-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Broadwell",
072c97
+      "typename": "Broadwell-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Broadwell-noTSX",
072c97
+      "typename": "Broadwell-noTSX-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Broadwell-noTSX-IBRS",
072c97
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "Broadwell-IBRS",
072c97
+      "typename": "Broadwell-IBRS-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    },
072c97
+    {
072c97
+      "name": "486",
072c97
+      "typename": "486-x86_64-cpu",
072c97
+      "unavailable-features": [],
072c97
+      "static": false,
072c97
+      "migration-safe": true
072c97
+    }
072c97
+  ],
072c97
+  "id": "definitions"
072c97
+}
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
072c97
new file mode 100644
072c97
index 0000000000..7e57c2ded6
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
072c97
@@ -0,0 +1,4 @@
072c97
+0506e3
072c97
+family:     6 (0x06)
072c97
+model:     94 (0x5e)
072c97
+stepping:   3 (0x03)
072c97
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
072c97
new file mode 100644
072c97
index 0000000000..437429d61d
072c97
--- /dev/null
072c97
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
072c97
@@ -0,0 +1,47 @@
072c97
+
072c97
+<cpudata arch='x86'>
072c97
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
072c97
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x06100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
072c97
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c30000'/>
072c97
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
072c97
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
072c97
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x00000000' edx='0x9c002400'/>
072c97
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300804' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
072c97
+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000006'/>
072c97
+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000006'/>
072c97
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000114' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
072c97
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
072c97
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d334520' ecx='0x35323231' edx='0x20357620'/>
072c97
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e332040' ebx='0x48473033' ecx='0x0000007a' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
072c97
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
072c97
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
072c97
+</cpudata>
072c97
-- 
072c97
2.21.0
072c97