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