132 lines
6.1 KiB
Diff
132 lines
6.1 KiB
Diff
From 9696e88e150fce9ea82eadb16726c8c3a7a197ae Mon Sep 17 00:00:00 2001
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
|
Date: Mon, 18 May 2020 20:55:42 +0200
|
|
Subject: [PATCH 1/3] cpu_map: Add pschange-mc-no bit in IA32_ARCH_CAPABILITIES
|
|
MSR
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
Signed-off-by: Jingyi Wang <wangjingyi11@huawei.com>
|
|
---
|
|
src/cpu_map/x86_features.xml | 3 +++
|
|
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml | 2 +-
|
|
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml | 1 +
|
|
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml | 1 +
|
|
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml | 1 +
|
|
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
|
|
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
|
|
tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
|
|
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
|
|
9 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
|
|
index 2c4c29dc99..8525ae0fa5 100644
|
|
--- a/src/cpu_map/x86_features.xml
|
|
+++ b/src/cpu_map/x86_features.xml
|
|
@@ -509,6 +509,9 @@
|
|
<feature name='mds-no'>
|
|
<msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
|
|
</feature>
|
|
+ <feature name='pschange-mc-no'>
|
|
+ <msr index='0x10a' edx='0x00000000' eax='0x00000040'/>
|
|
+ </feature>
|
|
<feature name='tsx-ctrl'>
|
|
<msr index='0x10a' edx='0x00000000' eax='0x00000080'/>
|
|
</feature>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
|
|
index 6c480eeacf..57f8ebabba 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
|
|
@@ -5,5 +5,5 @@
|
|
<cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c47ab' ecx='0x00000004' edx='0xac000400'/>
|
|
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
|
|
<cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
|
|
- <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
|
|
+ <msr index='0x10a' edx='0x00000000' eax='0x00000048'/>
|
|
</cpudata>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
|
|
index 92404e4d03..ed06515e99 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
|
|
@@ -26,6 +26,7 @@
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
<feature policy='require' name='skip-l1dfl-vmentry'/>
|
|
+ <feature policy='require' name='pschange-mc-no'/>
|
|
<feature policy='disable' name='hle'/>
|
|
<feature policy='disable' name='rtm'/>
|
|
</cpu>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
|
|
index 7f6fe2eac3..7681c94649 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
|
|
@@ -27,4 +27,5 @@
|
|
<feature name='pdpe1gb'/>
|
|
<feature name='invtsc'/>
|
|
<feature name='skip-l1dfl-vmentry'/>
|
|
+ <feature name='pschange-mc-no'/>
|
|
</cpu>
|
|
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
|
|
index 645c0934c2..4774d39c7e 100644
|
|
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
|
|
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
|
|
@@ -14,6 +14,7 @@
|
|
<feature policy='require' name='xsaves'/>
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
<feature policy='require' name='skip-l1dfl-vmentry'/>
|
|
+ <feature policy='require' name='pschange-mc-no'/>
|
|
<feature policy='disable' name='hle'/>
|
|
<feature policy='disable' name='rtm'/>
|
|
</cpu>
|
|
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
|
|
index 1b8b8be2f5..fcb0505da0 100644
|
|
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
|
|
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
|
|
@@ -47,6 +47,7 @@
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
<feature policy='require' name='skip-l1dfl-vmentry'/>
|
|
+ <feature policy='require' name='pschange-mc-no'/>
|
|
</mode>
|
|
<mode name='custom' supported='yes'>
|
|
<model usable='yes'>qemu64</model>
|
|
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
|
|
index 213dcc5a08..e22ef8e032 100644
|
|
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
|
|
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
|
|
@@ -46,6 +46,7 @@
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
<feature policy='require' name='skip-l1dfl-vmentry'/>
|
|
+ <feature policy='require' name='pschange-mc-no'/>
|
|
</mode>
|
|
<mode name='custom' supported='yes'>
|
|
<model usable='yes'>qemu64</model>
|
|
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
|
|
index 45c3e00b1e..ff721530cd 100644
|
|
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
|
|
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
|
|
@@ -47,6 +47,7 @@
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
<feature policy='require' name='skip-l1dfl-vmentry'/>
|
|
+ <feature policy='require' name='pschange-mc-no'/>
|
|
</mode>
|
|
<mode name='custom' supported='yes'>
|
|
<model usable='yes'>qemu64</model>
|
|
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
|
|
index d2a884eed1..2c6066003d 100644
|
|
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
|
|
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
|
|
@@ -46,6 +46,7 @@
|
|
<feature policy='require' name='pdpe1gb'/>
|
|
<feature policy='require' name='invtsc'/>
|
|
<feature policy='require' name='skip-l1dfl-vmentry'/>
|
|
+ <feature policy='require' name='pschange-mc-no'/>
|
|
</mode>
|
|
<mode name='custom' supported='yes'>
|
|
<model usable='yes'>qemu64</model>
|
|
--
|
|
2.27.0
|
|
|