External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_map: Don't use new noTSX models for host-model CPUs

Browse Source 
Host-model CPU definitions (and domain capabilities) will use the
original CPU models (without noTSX in their name) and explicitly disable
hle and rtm features. This way domains with host-model CPUs will be
migratable even to older versions of libvirt which do not support the
noTSX model variants.

The new models will be advertised in host capabilities and they may
be used explicitly with custom CPUs.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
This commit is contained in:
Jiri Denemark 2020-03-17 22:32:16 +01:00
parent 7cd896ef31
commit 17cdefe5f1
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu_map/x86_Cascadelake-Server-noTSX.xml
View File

@ -1,6 +1,6 @@
<cpus>
<model name='Cascadelake-Server-noTSX'>
<decode host='on' guest='on'/>
<decode host='on' guest='off'/>
<signature family='6' model='85'/> <!-- 050654 -->
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>

2
src/cpu_map/x86_Icelake-Client-noTSX.xml
View File

@ -1,6 +1,6 @@
<cpus>
<model name='Icelake-Client-noTSX'>
<decode host='on' guest='on'/>
<decode host='on' guest='off'/>
<signature family='6' model='126'/> <!-- 0706e0 -->
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>

2
src/cpu_map/x86_Icelake-Server-noTSX.xml
View File

@ -1,6 +1,6 @@
<cpus>
<model name='Icelake-Server-noTSX'>
<decode host='on' guest='on'/>
<decode host='on' guest='off'/>
<signature family='6' model='134'/> <!-- 080660 -->
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>

2
src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
View File

@ -1,6 +1,6 @@
<cpus>
<model name='Skylake-Client-noTSX-IBRS'>
<decode host='on' guest='on'/>
<decode host='on' guest='off'/>
<signature family='6' model='94'/> <!-- 0506e0 -->
<signature family='6' model='78'/> <!-- 0406e0 -->
<!-- These are Kaby Lake and Coffee Lake successors to Skylake,

2
src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
View File

@ -1,6 +1,6 @@
<cpus>
<model name='Skylake-Server-noTSX-IBRS'>
<decode host='on' guest='on'/>
<decode host='on' guest='off'/>
<signature family='6' model='85'/> <!-- 050654 -->
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>

4
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
View File

@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-noTSX-IBRS</model>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
@ -26,4 +26,6 @@
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='disable' name='hle'/>
<feature policy='disable' name='rtm'/>
</cpu>

4
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
View File

@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-noTSX-IBRS</model>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
@ -14,4 +14,6 @@
<feature policy='require' name='xsaves'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='disable' name='hle'/>
<feature policy='disable' name='rtm'/>
</cpu>