Signed-off-by: Jiri Denemark <jdene...@redhat.com>
Reviewed-by: John Ferlan <jfer...@redhat.com>
---
Notes:
Version 2:
- no change
tests/cputest.c | 1 +
.../x86_64-cpuid-Xeon-E7-4830-disabled.xml | 5 +
.../x86_64-cpuid-Xeon-E7-4830-enabled.xml | 8 +
.../x86_64-cpuid-Xeon-E7-4830-guest.xml | 28 +++
.../cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml | 29 +++
.../cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml | 13 ++
tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json | 235 +++++++++++++++++++++
tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml | 30 +++
8 files changed, 349 insertions(+)
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-disabled.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml
diff --git a/tests/cputest.c b/tests/cputest.c
index a15b1c8935..43622eb74b 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -1149,6 +1149,7 @@ mymain(void)
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST);
+ DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4830", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890", JSON_NONE);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST);
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-disabled.xml
new file mode 100644
index 0000000000..a9cbd949e4
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-disabled.xml
@@ -0,0 +1,5 @@
+<!-- Features disabled by QEMU -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x0004c1fc' edx='0xb0600000'/>
+ <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-E7-4830-enabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml
new file mode 100644
index 0000000000..1b80f414e5
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml
@@ -0,0 +1,8 @@
+<!-- Features enabled by QEMU -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x83ba2203' 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='0x00000002'
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='0x00000001' edx='0x2c100800'/>
+</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
new file mode 100644
index 0000000000..dbf8580a0e
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
@@ -0,0 +1,28 @@
+<cpu mode='custom' match='exact'>
+ <model fallback='forbid'>SandyBridge</model>
+ <vendor>Intel</vendor>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ds'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
+ <feature policy='require' name='ht'/>
+ <feature policy='require' name='tm'/>
+ <feature policy='require' name='pbe'/>
+ <feature policy='require' name='dtes64'/>
+ <feature policy='require' name='monitor'/>
+ <feature policy='require' name='ds_cpl'/>
+ <feature policy='require' name='vmx'/>
+ <feature policy='require' name='smx'/>
+ <feature policy='require' name='est'/>
+ <feature policy='require' name='tm2'/>
+ <feature policy='require' name='xtpr'/>
+ <feature policy='require' name='pdcm'/>
+ <feature policy='require' name='pcid'/>
+ <feature policy='require' name='dca'/>
+ <feature policy='require' name='arat'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='require' name='invtsc'/>
+ <feature policy='disable' name='tsc-deadline'/>
+ <feature policy='disable' name='xsave'/>
+ <feature policy='disable' name='avx'/>
+</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
new file mode 100644
index 0000000000..52902479b9
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -0,0 +1,29 @@
+<cpu>
+ <arch>x86_64</arch>
+ <model>Westmere</model>
+ <vendor>Intel</vendor>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
+ <feature name='pclmuldq'/>
+ <feature name='dtes64'/>
+ <feature name='monitor'/>
+ <feature name='ds_cpl'/>
+ <feature name='vmx'/>
+ <feature name='smx'/>
+ <feature name='est'/>
+ <feature name='tm2'/>
+ <feature name='xtpr'/>
+ <feature name='pdcm'/>
+ <feature name='pcid'/>
+ <feature name='dca'/>
+ <feature name='x2apic'/>
+ <feature name='arat'/>
+ <feature name='pdpe1gb'/>
+ <feature name='rdtscp'/>
+ <feature name='invtsc'/>
+</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
new file mode 100644
index 0000000000..c3f04d00d1
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
@@ -0,0 +1,13 @@
+<cpu mode='custom' match='exact'>
+ <model fallback='forbid'>SandyBridge</model>
+ <vendor>Intel</vendor>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
+ <feature policy='require' name='pcid'/>
+ <feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='arat'/>
+ <feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='disable' name='xsave'/>
+ <feature policy='disable' name='avx'/>
+</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json
new file mode 100644
index 0000000000..012e1d0c5c
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json
@@ -0,0 +1,235 @@
+{
+ "return": {
+ "model": {
+ "name": "base",
+ "props": {
+ "pfthreshold": false,
+ "pku": false,
+ "rtm": false,
+ "tsc_adjust": true,
+ "tsc-deadline": true,
+ "xstore-en": false,
+ "cpuid-0xb": true,
+ "abm": false,
+ "ia64": false,
+ "kvm-mmu": false,
+ "xsaveopt": false,
+ "hv-spinlocks": -1,
+ "tce": false,
+ "realized": false,
+ "kvm_steal_time": true,
+ "smep": false,
+ "fpu": true,
+ "xcrypt": false,
+ "sse4_2": true,
+ "clflush": true,
+ "sse4_1": true,
+ "flushbyasid": false,
+ "kvm-steal-time": true,
+ "lm": true,
+ "tsc": true,
+ "adx": false,
+ "fxsr": true,
+ "sha-ni": false,
+ "decodeassists": false,
+ "hv-relaxed": false,
+ "pclmuldq": true,
+ "xgetbv1": false,
+ "xstore": false,
+ "vmcb_clean": false,
+ "tsc-adjust": true,
+ "vme": true,
+ "vendor": "GenuineIntel",
+ "arat": true,
+ "ffxsr": false,
+ "de": true,
+ "aes": true,
+ "pse": true,
+ "ds-cpl": false,
+ "fxsr_opt": false,
+ "tbm": false,
+ "sse": true,
+ "phe-en": false,
+ "f16c": false,
+ "ds": false,
+ "mpx": false,
+ "vmware-cpuid-freq": true,
+ "avx512f": false,
+ "avx2": false,
+ "level": 11,
+ "pbe": false,
+ "cx16": true,
+ "ds_cpl": false,
+ "movbe": false,
+ "perfctr-nb": false,
+ "nrip_save": false,
+ "kvm_mmu": false,
+ "ospke": false,
+ "pmu": false,
+ "avx512ifma": false,
+ "stepping": 2,
+ "sep": true,
+ "sse4a": false,
+ "avx512dq": false,
+ "core-id": -1,
+ "i64": true,
+ "avx512-4vnniw": false,
+ "xsave": false,
+ "pmm": false,
+ "hle": false,
+ "nodeid_msr": false,
+ "hv-crash": false,
+ "est": false,
+ "osxsave": false,
+ "xop": false,
+ "smx": false,
+ "tsc-scale": false,
+ "monitor": false,
+ "avx512er": false,
+ "apic": true,
+ "sse4.1": true,
+ "sse4.2": true,
+ "hv-vapic": false,
+ "pause-filter": false,
+ "lahf-lm": true,
+ "kvm-nopiodelay": true,
+ "cmp_legacy": false,
+ "acpi": false,
+ "fma4": false,
+ "mmx": true,
+ "svm_lock": false,
+ "pcommit": false,
+ "mtrr": true,
+ "clwb": false,
+ "dca": false,
+ "pdcm": false,
+ "xcrypt-en": false,
+ "3dnow": false,
+ "invtsc": false,
+ "tm2": false,
+ "hv-time": false,
+ "hypervisor": true,
+ "kvmclock-stable-bit": true,
+ "xlevel": 2147483656,
+ "lahf_lm": true,
+ "enforce": false,
+ "pcid": true,
+ "sse4-1": true,
+ "lbrv": false,
+ "avx512-vpopcntdq": false,
+ "avx512-4fmaps": false,
+ "fill-mtrr-mask": true,
+ "pause_filter": false,
+ "svm-lock": false,
+ "popcnt": true,
+ "nrip-save": false,
+ "avx512vl": false,
+ "x2apic": true,
+ "kvmclock": true,
+ "smap": false,
+ "pdpe1gb": true,
+ "family": 6,
+ "min-level": 11,
+ "xlevel2": 0,
+ "dtes64": false,
+ "xd": true,
+ "kvm_pv_eoi": true,
+ "ace2": false,
+ "kvm_pv_unhalt": true,
+ "xtpr": false,
+ "perfctr_nb": false,
+ "avx512bw": false,
+ "l3-cache": true,
+ "nx": true,
+ "lwp": false,
+ "msr": true,
+ "syscall": true,
+ "tm": false,
+ "perfctr-core": false,
+ "memory": "/machine/unattached/system[0]",
+ "pge": true,
+ "pn": false,
+ "fma": false,
+ "nodeid-msr": false,
+ "xsavec": false,
+ "socket-id": -1,
+ "thread-id": -1,
+ "cx8": true,
+ "mce": true,
+ "avx512cd": false,
+ "cr8legacy": false,
+ "mca": true,
+ "avx512pf": false,
+ "pni": true,
+ "hv-vendor-id": "",
+ "rdseed": false,
+ "osvw": false,
+ "fsgsbase": false,
+ "model-id": " Intel(R) Xeon(R) CPU E7- 4830 @ 2.13GHz",
+ "cmp-legacy": false,
+ "kvm-pv-unhalt": true,
+ "rdtscp": true,
+ "mmxext": false,
+ "host-phys-bits": true,
+ "cid": false,
+ "vmx": false,
+ "ssse3": true,
+ "extapic": false,
+ "pse36": true,
+ "min-xlevel": 2147483656,
+ "ibs": false,
+ "la57": false,
+ "avx": false,
+ "kvm-no-smi-migration": false,
+ "ace2-en": false,
+ "umip": false,
+ "invpcid": false,
+ "bmi1": false,
+ "bmi2": false,
+ "vmcb-clean": false,
+ "erms": false,
+ "cmov": true,
+ "check": true,
+ "perfctr_core": false,
+ "misalignsse": false,
+ "clflushopt": false,
+ "pat": true,
+ "sse4-2": true,
+ "3dnowprefetch": false,
+ "rdpid": false,
+ "full-cpuid-auto-level": true,
+ "pae": true,
+ "wdt": false,
+ "tsc_scale": false,
+ "skinit": false,
+ "fxsr-opt": false,
+ "kvm_nopiodelay": true,
+ "phys-bits": 0,
+ "kvm": true,
+ "pmm-en": false,
+ "phe": false,
+ "3dnowext": false,
+ "lmce": true,
+ "ht": false,
+ "tsc-frequency": 0,
+ "kvm-pv-eoi": true,
+ "npt": false,
+ "apic-id": 4294967295,
+ "kvm_asyncpf": true,
+ "min-xlevel2": 0,
+ "pclmulqdq": true,
+ "svm": false,
+ "sse3": true,
+ "sse2": true,
+ "ss": true,
+ "topoext": false,
+ "rdrand": false,
+ "avx512vbmi": false,
+ "kvm-asyncpf": true,
+ "xsaves": false,
+ "model": 47
+ }
+ }
+ },
+ "id": "model-expansion"
+}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml
new file mode 100644
index 0000000000..d565238167
--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml
@@ -0,0 +1,30 @@
+<!-- Intel(R) Xeon(R) CPU E7- 4830 @ 2.13GHz -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547'
ecx='0x6c65746e' edx='0x49656e69'/>
+ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206f2' ebx='0x80400800'
ecx='0x02bee3ff' edx='0xbfebfbff'/>
+ <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b2ec'
ecx='0x00000000' edx='0x09ca212c'/>
+ <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x7c004121' ebx='0x01c0003f'
ecx='0x0000003f' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x7c004122' ebx='0x00c0003f'
ecx='0x0000007f' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x7c004143' ebx='0x01c0003f'
ecx='0x000001ff' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x7c0fc163' ebx='0x05c0003f'
ecx='0x00003fff' edx='0x00000006'/>
+ <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040'
ecx='0x00000003' edx='0x00001120'/>
+ <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000007' ebx='0x00000001'
ecx='0x00000009' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000004'
ecx='0x00000000' edx='0x00000603'/>
+ <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002'
ecx='0x00000100' edx='0x00000080'/>
+ <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000006' ebx='0x00000010'
ecx='0x00000201' edx='0x00000080'/>
+ <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000001' edx='0x2c100800'/>
+ <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020'
ecx='0x6c65746e' edx='0x20295228'/>
+ <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6e6f6558' ebx='0x20295228'
ecx='0x20555043' edx='0x202d3745'/>
+ <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30333834' ebx='0x20402020'
ecx='0x33312e32' edx='0x007a4847'/>
+ <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x01006040' edx='0x00000000'/>
+ <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000100'/>
+ <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302c' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002'
ecx='0x00000100' edx='0x00000080'/>
+ <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002'
ecx='0x00000100' edx='0x00000080'/>
+</cpudata>
--
2.14.2
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
