From bd665085c2cd890f2249042f135b7a1735932d1b Mon Sep 17 00:00:00 2001
Message-Id: <bd665085c2cd890f2249042f135b7a1735932d1b@dist-git>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 21 Jun 2019 09:24:48 +0200
Subject: [PATCH] cpu_map: Add support for arch-capabilities feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
(cherry picked from commit 511df17aec36385320dbcc088ba85968537d1d42)

https://bugzilla.redhat.com/show_bug.cgi?id=1693433

Conflicts:
	src/cpu_map/x86_features.xml
            - cpu_map split was not backported

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Message-Id: <fc8d72f3a2191ef85b537943aa1cc844f50b038d.1561068591.git.jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/cpu/cpu_map.xml                                        | 3 +++
 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json        | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json        | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json         | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index ceee0ae489..a9f284fbbe 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -337,6 +337,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 94a60fcc8f..1f53bb8bf3 100644
--- 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 10c5434263..6bdaf6e83a 100644
--- 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 0506dec0a7..2c6be20768 100644
--- 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 79f3580219..79b47a56fb 100644
--- 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
       }
-- 
2.22.0