9ae3a8
From 1dd8f3631cc86fcf670f69befb5cd02e0b548da4 Mon Sep 17 00:00:00 2001
9ae3a8
From: "plai@redhat.com" <plai@redhat.com>
9ae3a8
Date: Mon, 23 Sep 2019 20:40:21 +0200
9ae3a8
Subject: [PATCH 05/12] i386: Add CPUID bit and feature words for
9ae3a8
 IA32_ARCH_CAPABILITIES MSR
9ae3a8
9ae3a8
RH-Author: plai@redhat.com
9ae3a8
Message-id: <1569271227-28026-5-git-send-email-plai@redhat.com>
9ae3a8
Patchwork-id: 90857
9ae3a8
O-Subject: [RHEL7.8 qemu-kvm PATCH v6 04/10] i386: Add CPUID bit and feature words for IA32_ARCH_CAPABILITIES MSR
9ae3a8
Bugzilla: 1709971
9ae3a8
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
9ae3a8
RH-Acked-by: Bandan Das <bsd@redhat.com>
9ae3a8
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
9ae3a8
From: Robert Hoo <robert.hu@linux.intel.com>
9ae3a8
9ae3a8
Support of IA32_PRED_CMD MSR already be enumerated by same CPUID bit as
9ae3a8
SPEC_CTRL.
9ae3a8
9ae3a8
At present, mark CPUID_7_0_EDX_ARCH_CAPABILITIES unmigratable, per Paolo's
9ae3a8
comment.
9ae3a8
9ae3a8
Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
9ae3a8
Message-Id: <1530781798-183214-3-git-send-email-robert.hu@linux.intel.com>
9ae3a8
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
9ae3a8
(cherry picked from commit 3fc7c73139d2d38ae80c3b0bc963b1ac1555924c)
9ae3a8
Signed-off-by: Paul Lai <plai@redhat.com>
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 target-i386/cpu.c | 2 +-
9ae3a8
 1 file changed, 1 insertion(+), 1 deletion(-)
9ae3a8
9ae3a8
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
9ae3a8
index ff0921f..838c616 100644
9ae3a8
--- a/target-i386/cpu.c
9ae3a8
+++ b/target-i386/cpu.c
9ae3a8
@@ -174,7 +174,7 @@ static const char *cpuid_7_0_edx_feature_name[] = {
9ae3a8
     NULL, NULL, NULL, NULL,
9ae3a8
     NULL, NULL, NULL, NULL,
9ae3a8
     NULL, NULL, "spec-ctrl", "stibp",
9ae3a8
-    NULL, "arch-facilities", NULL, "ssbd",
9ae3a8
+    NULL, "arch-facilities|arch-capabilities", NULL, "ssbd",
9ae3a8
 };
9ae3a8
 
9ae3a8
 static const char *cpuid_80000008_ebx_feature_name[] = {
9ae3a8
-- 
9ae3a8
1.8.3.1
9ae3a8