[libvirt] [PATCH 3/3] cpu: Add new Skylake-Server CPU model

Available since QEMU 2.10.0 (specifically commit v2.9.0-2233-g53f9a6f45f). Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu/cpu_map.xml | 75 ++++++++++++++++++++++ .../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 9 +-- .../x86_64-cpuid-Xeon-Gold-6148-host.xml | 9 +-- .../x86_64-cpuid-Xeon-Gold-6148-json.xml | 9 +-- 4 files changed, 78 insertions(+), 24 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index c1aee0abc9..96f4ce60dd 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1288,6 +1288,81 @@ <feature name='xsaveopt'/> </model> + <model name='Skylake-Server'> + <signature family='6' model='85'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='mpx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> + <!-- AMD CPUs --> <model name='athlon'> <vendor name='AMD'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml index 874f77105d..f72bcea68b 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml @@ -1,5 +1,5 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>Skylake-Client</model> + <model fallback='forbid'>Skylake-Server</model> <vendor>Intel</vendor> <feature policy='require' name='ds'/> <feature policy='require' name='acpi'/> @@ -20,17 +20,10 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='cmt'/> - <feature policy='require' name='avx512f'/> - <feature policy='require' name='avx512dq'/> <feature policy='require' name='clflushopt'/> - <feature policy='require' name='clwb'/> - <feature policy='require' name='avx512cd'/> - <feature policy='require' name='avx512bw'/> - <feature policy='require' name='avx512vl'/> <feature policy='require' name='pku'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> <feature policy='require' name='mbm_local'/> - <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml index 0d14e88891..1a68e35c19 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client</model> + <model>Skylake-Server</model> <vendor>Intel</vendor> <feature name='ds'/> <feature name='acpi'/> @@ -21,17 +21,10 @@ <feature name='osxsave'/> <feature name='tsc_adjust'/> <feature name='cmt'/> - <feature name='avx512f'/> - <feature name='avx512dq'/> <feature name='clflushopt'/> - <feature name='clwb'/> - <feature name='avx512cd'/> - <feature name='avx512bw'/> - <feature name='avx512vl'/> <feature name='pku'/> <feature name='xsaves'/> <feature name='mbm_total'/> <feature name='mbm_local'/> - <feature name='pdpe1gb'/> <feature name='invtsc'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml index f10a7dec20..1dfad4a0cb 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml @@ -1,15 +1,8 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>Skylake-Client</model> + <model fallback='forbid'>Skylake-Server</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='avx512f'/> - <feature policy='require' name='avx512dq'/> <feature policy='require' name='clflushopt'/> - <feature policy='require' name='clwb'/> - <feature policy='require' name='avx512cd'/> - <feature policy='require' name='avx512bw'/> - <feature policy='require' name='avx512vl'/> - <feature policy='require' name='pdpe1gb'/> </cpu> -- 2.14.1