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: Add support for arch-capabilities feature

Browse Source 
The feature was added to QEMU in 3.1.0 and it is currently blocking
migration, which is expected to change in the future. Luckily 3.1.0 is
new enough to give us migratability hints on each feature via
query-cpu-model-expension, which means we don't need to use the
"migratable" attribute on the CPU map XML.

The kernel calls this feature arch_capabilities and RHEL/CentOS 7.* use
arch-facilities. Apparently some CPU test files were gathered with the
RHEL version of QEMU. Let's update the test files to avoid possible
confusion about the correct naming.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-01-10 14:35:07 +01:00
parent 2ebcff3a74
commit 511df17aec
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu_map/x86_features.xml
View File

@ -326,6 +326,9 @@
<feature name='stibp'> <feature name='stibp'>
<cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
</feature> </feature>
<feature name='arch-capabilities'> <!-- arch_capabilities, arch-facilities -->
<cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
</feature>
<feature name='ssbd'> <feature name='ssbd'>
<cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
</feature> </feature>

2
tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json
View File

@ -232,7 +232,7 @@
"avx512vbmi": false, "avx512vbmi": false,
"kvm-asyncpf": true, "kvm-asyncpf": true,
"spec-ctrl": false, "spec-ctrl": false,
"arch-facilities": false, "arch-capabilities": false,
"model": 1, "model": 1,
"node-id": -1 "node-id": -1
} }

2
tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json
View File

@ -232,7 +232,7 @@
"avx512vbmi": false, "avx512vbmi": false,
"kvm-asyncpf": true, "kvm-asyncpf": true,
"spec-ctrl": true, "spec-ctrl": true,
"arch-facilities": false, "arch-capabilities": false,
"model": 63, "model": 63,
"node-id": -1 "node-id": -1
} }

2
tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json
View File

@ -232,7 +232,7 @@
"avx512vbmi": false, "avx512vbmi": false,
"kvm-asyncpf": true, "kvm-asyncpf": true,
"spec-ctrl": true, "spec-ctrl": true,
"arch-facilities": false, "arch-capabilities": false,
"model": 79, "model": 79,
"node-id": -1 "node-id": -1
} }

2
tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json
View File

@ -232,7 +232,7 @@
"avx512vbmi": false, "avx512vbmi": false,
"kvm-asyncpf": true, "kvm-asyncpf": true,
"spec-ctrl": true, "spec-ctrl": true,
"arch-facilities": false, "arch-capabilities": false,
"model": 85, "model": 85,
"node-id": -1 "node-id": -1
} }