0a7476
From ead15fe7a0cd60eb91ff7744b24af15b6c122239 Mon Sep 17 00:00:00 2001
0a7476
Message-Id: <ead15fe7a0cd60eb91ff7744b24af15b6c122239@dist-git>
35ebd4
From: Jiri Denemark <jdenemar@redhat.com>
35ebd4
Date: Wed, 9 Jan 2019 15:39:49 +0100
35ebd4
Subject: [PATCH] RHEL: cpu_map: Mark arch-facilities feature as non-migratable
35ebd4
MIME-Version: 1.0
35ebd4
Content-Type: text/plain; charset=UTF-8
35ebd4
Content-Transfer-Encoding: 8bit
35ebd4
35ebd4
RHEL-only
35ebd4
35ebd4
The arch-facilities feature, which was added only in RHEL, is not
35ebd4
migratable and thus it should not be included in host-model features.
35ebd4
35ebd4
The feature was introduced as arch-capabilities upstream in QEMU 3.1.0,
35ebd4
which is later than QEMU 2.10, where we started probing what features
35ebd4
cannot be migrated, so we don't need to add this cpu_map hack there.
35ebd4
35ebd4
https://bugzilla.redhat.com/show_bug.cgi?id=1658406
35ebd4
https://bugzilla.redhat.com/show_bug.cgi?id=1664793
35ebd4
35ebd4
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
35ebd4
Reviewed-by: Ján Tomko <jtomko@redhat.com>
35ebd4
---
35ebd4
 src/cpu/cpu_map.xml | 2 +-
35ebd4
 1 file changed, 1 insertion(+), 1 deletion(-)
35ebd4
35ebd4
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
35ebd4
index f1f8048c14..9d53d4b43a 100644
35ebd4
--- a/src/cpu/cpu_map.xml
35ebd4
+++ b/src/cpu/cpu_map.xml
35ebd4
@@ -301,7 +301,7 @@
35ebd4
     <feature name='stibp'>
35ebd4
       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
35ebd4
     </feature>
35ebd4
-    <feature name='arch-facilities'>
35ebd4
+    <feature name='arch-facilities' migratable='no'>
35ebd4
       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
35ebd4
     </feature>
35ebd4
     <feature name='ssbd'>
35ebd4
-- 
0a7476
2.21.0
35ebd4