cpu_map: Add support for arch-capabilities feature

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>

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 59236456d681d955767a3e9ba981c6ec9d0b7a67..02431bea29d3a8bd7da13fe260f035558207af88 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -326,6 +326,9 @@
   <feature name='stibp'>
     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
   </feature>
+  <feature name='arch-capabilities'> <!-- arch_capabilities, arch-facilities -->
+    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
+  </feature>
   <feature name='ssbd'>
     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
   </feature>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json
index 94a60fcc8f028143db807451bbec8c5a2464e2a0..1f53bb8bf304a4d0bc756ffc686ee91213a30af2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json
@@ -232,7 +232,7 @@
         "avx512vbmi": false,
         "kvm-asyncpf": true,
         "spec-ctrl": false,
-        "arch-facilities": false,
+        "arch-capabilities": false,
         "model": 1,
         "node-id": -1
       }

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json
index 10c5434263e0b5638788fa9577d2110e5aedcf56..6bdaf6e83aca899322b66e88e1ea4baeed8bf641 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json
@@ -232,7 +232,7 @@
         "avx512vbmi": false,
         "kvm-asyncpf": true,
         "spec-ctrl": true,
-        "arch-facilities": false,
+        "arch-capabilities": false,
         "model": 63,
         "node-id": -1
       }

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json
index 0506dec0a7db2e3f933c413e331f26ff1618e34b..2c6be207688a6b7b6ad28f94b00ae53add5cbacf 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json
@@ -232,7 +232,7 @@
         "avx512vbmi": false,
         "kvm-asyncpf": true,
         "spec-ctrl": true,
-        "arch-facilities": false,
+        "arch-capabilities": false,
         "model": 79,
         "node-id": -1
       }

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json
index 79f3580219e83c8f3072eb1d2d1aba0e838e4ce3..79b47a56fbbd910e491f9192a9373b68adf2b380 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json
@@ -232,7 +232,7 @@
         "avx512vbmi": false,
         "kvm-asyncpf": true,
         "spec-ctrl": true,
-        "arch-facilities": false,
+        "arch-capabilities": false,
         "model": 85,
         "node-id": -1
       }