the vmx-* features are currently decoded from the 32-lower bits
(EAX) of the MSR 64-bit values. They should be decoded instead
from the 32-higher bits (EDX).
---
src/cpu_map/x86_features.xml | 136 +++++++++---------
.../x86_64-cpuid-Atom-P5362-2-enabled.xml | 10 +-
.../x86_64-cpuid-Atom-P5362-enabled.xml | 10 +-
.../x86_64-cpuid-Cooperlake-enabled.xml | 10 +-
.../x86_64-cpuid-Core-i7-1270P-enabled.xml | 10 +-
.../x86_64-cpuid-Core-i7-1365U-enabled.xml | 10 +-
.../x86_64-cpuid-Core-i7-8550U-enabled.xml | 10 +-
.../x86_64-cpuid-Xeon-6731E-enabled.xml | 10 +-
.../x86_64-cpuid-Xeon-6788P-disabled.xml | 1 +
.../x86_64-cpuid-Xeon-6788P-enabled.xml | 10 +-
...x86_64-cpuid-Xeon-Bronze-3408U-enabled.xml | 10 +-
.../x86_64-cpuid-Xeon-E3-1270-v5-enabled.xml | 10 +-
.../x86_64-cpuid-Xeon-Gold-6152-enabled.xml | 10 +-
.../x86_64-cpuid-Xeon-Gold-6530-enabled.xml | 10 +-
...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 10 +-
...x86_64-cpuid-Xeon-Silver-4214R-enabled.xml | 10 +-
.../x86_64-cpuid-Xeon-w7-3465X-enabled.xml | 10 +-
17 files changed, 144 insertions(+), 143 deletions(-)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 5220a3d172..2a2ac57f90 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -982,67 +982,67 @@
<!-- msr 0x0000048b -->
<feature name='vmx-apicv-xapic'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000001'/>
+ <msr index='0x0000048b' edx='0x00000001' eax='0x00000000'/>
</feature>
<feature name='vmx-ept'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000002'/>
+ <msr index='0x0000048b' edx='0x00000002' eax='0x00000000'/>
</feature>
<feature name='vmx-desc-exit'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x0000048b' edx='0x00000004' eax='0x00000000'/>
</feature>
<feature name='vmx-rdtscp-exit'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000008'/>
+ <msr index='0x0000048b' edx='0x00000008' eax='0x00000000'/>
</feature>
<feature name='vmx-apicv-x2apic'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000010'/>
+ <msr index='0x0000048b' edx='0x00000010' eax='0x00000000'/>
</feature>
<feature name='vmx-vpid'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000020'/>
+ <msr index='0x0000048b' edx='0x00000020' eax='0x00000000'/>
</feature>
<feature name='vmx-wbinvd-exit'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000040'/>
+ <msr index='0x0000048b' edx='0x00000040' eax='0x00000000'/>
</feature>
<feature name='vmx-unrestricted-guest'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000048b' edx='0x00000080' eax='0x00000000'/>
</feature>
<feature name='vmx-apicv-register'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000100'/>
+ <msr index='0x0000048b' edx='0x00000100' eax='0x00000000'/>
</feature>
<feature name='vmx-apicv-vid'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000200'/>
+ <msr index='0x0000048b' edx='0x00000200' eax='0x00000000'/>
</feature>
<feature name='vmx-ple'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000400'/>
+ <msr index='0x0000048b' edx='0x00000400' eax='0x00000000'/>
</feature>
<feature name='vmx-rdrand-exit'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00000800'/>
+ <msr index='0x0000048b' edx='0x00000800' eax='0x00000000'/>
</feature>
<feature name='vmx-invpcid-exit'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00001000'/>
+ <msr index='0x0000048b' edx='0x00001000' eax='0x00000000'/>
</feature>
<feature name='vmx-vmfunc'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00002000'/>
+ <msr index='0x0000048b' edx='0x00002000' eax='0x00000000'/>
</feature>
<feature name='vmx-shadow-vmcs'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00004000'/>
+ <msr index='0x0000048b' edx='0x00004000' eax='0x00000000'/>
</feature>
<feature name='vmx-encls-exit'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x0000048b' edx='0x00008000' eax='0x00000000'/>
</feature>
<feature name='vmx-rdseed-exit'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00010000'/>
+ <msr index='0x0000048b' edx='0x00010000' eax='0x00000000'/>
</feature>
<feature name='vmx-pml'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00020000'/>
+ <msr index='0x0000048b' edx='0x00020000' eax='0x00000000'/>
</feature>
<feature name='vmx-xsaves'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x00100000'/>
+ <msr index='0x0000048b' edx='0x00100000' eax='0x00000000'/>
</feature>
<feature name='vmx-tsc-scaling'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x02000000'/>
+ <msr index='0x0000048b' edx='0x02000000' eax='0x00000000'/>
</feature>
<feature name='vmx-enable-user-wait-pause'>
- <msr index='0x0000048b' edx='0x00000000' eax='0x04000000'/>
+ <msr index='0x0000048b' edx='0x04000000' eax='0x00000000'/>
</feature>
<!-- msr 0x0000048c -->
@@ -1101,151 +1101,151 @@
<!-- msr 0x0000048d -->
<feature name='vmx-intr-exit'>
- <msr index='0x0000048d' edx='0x00000000' eax='0x00000001'/>
+ <msr index='0x0000048d' edx='0x00000001' eax='0x00000000'/>
</feature>
<feature name='vmx-nmi-exit'>
- <msr index='0x0000048d' edx='0x00000000' eax='0x00000008'/>
+ <msr index='0x0000048d' edx='0x00000008' eax='0x00000000'/>
</feature>
<feature name='vmx-vnmi'>
- <msr index='0x0000048d' edx='0x00000000' eax='0x00000020'/>
+ <msr index='0x0000048d' edx='0x00000020' eax='0x00000000'/>
</feature>
<feature name='vmx-preemption-timer'>
- <msr index='0x0000048d' edx='0x00000000' eax='0x00000040'/>
+ <msr index='0x0000048d' edx='0x00000040' eax='0x00000000'/>
</feature>
<feature name='vmx-posted-intr'>
- <msr index='0x0000048d' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000048d' edx='0x00000080' eax='0x00000000'/>
</feature>
<!-- msr 0x0000048e -->
<feature name='vmx-vintr-pending'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x0000048e' edx='0x00000004' eax='0x00000000'/>
</feature>
<feature name='vmx-tsc-offset'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00000008'/>
+ <msr index='0x0000048e' edx='0x00000008' eax='0x00000000'/>
</feature>
<feature name='vmx-hlt-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000048e' edx='0x00000080' eax='0x00000000'/>
</feature>
<feature name='vmx-invlpg-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00000200'/>
+ <msr index='0x0000048e' edx='0x00000200' eax='0x00000000'/>
</feature>
<feature name='vmx-mwait-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00000400'/>
+ <msr index='0x0000048e' edx='0x00000400' eax='0x00000000'/>
</feature>
<feature name='vmx-rdpmc-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00000800'/>
+ <msr index='0x0000048e' edx='0x00000800' eax='0x00000000'/>
</feature>
<feature name='vmx-rdtsc-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00001000'/>
+ <msr index='0x0000048e' edx='0x00001000' eax='0x00000000'/>
</feature>
<feature name='vmx-cr3-load-noexit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x0000048e' edx='0x00008000' eax='0x00000000'/>
</feature>
<feature name='vmx-cr3-store-noexit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00010000'/>
+ <msr index='0x0000048e' edx='0x00010000' eax='0x00000000'/>
</feature>
<feature name='vmx-cr8-load-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00080000'/>
+ <msr index='0x0000048e' edx='0x00080000' eax='0x00000000'/>
</feature>
<feature name='vmx-cr8-store-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00100000'/>
+ <msr index='0x0000048e' edx='0x00100000' eax='0x00000000'/>
</feature>
<feature name='vmx-flexpriority'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00200000'/>
+ <msr index='0x0000048e' edx='0x00200000' eax='0x00000000'/>
</feature>
<feature name='vmx-vnmi-pending'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00400000'/>
+ <msr index='0x0000048e' edx='0x00400000' eax='0x00000000'/>
</feature>
<feature name='vmx-movdr-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x00800000'/>
+ <msr index='0x0000048e' edx='0x00800000' eax='0x00000000'/>
</feature>
<feature name='vmx-io-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x01000000'/>
+ <msr index='0x0000048e' edx='0x01000000' eax='0x00000000'/>
</feature>
<feature name='vmx-io-bitmap'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x02000000'/>
+ <msr index='0x0000048e' edx='0x02000000' eax='0x00000000'/>
</feature>
<feature name='vmx-mtf'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x08000000'/>
+ <msr index='0x0000048e' edx='0x08000000' eax='0x00000000'/>
</feature>
<feature name='vmx-msr-bitmap'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x10000000'/>
+ <msr index='0x0000048e' edx='0x10000000' eax='0x00000000'/>
</feature>
<feature name='vmx-monitor-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x20000000'/>
+ <msr index='0x0000048e' edx='0x20000000' eax='0x00000000'/>
</feature>
<feature name='vmx-pause-exit'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x40000000'/>
+ <msr index='0x0000048e' edx='0x40000000' eax='0x00000000'/>
</feature>
<feature name='vmx-secondary-ctls'>
- <msr index='0x0000048e' edx='0x00000000' eax='0x80000000'/>
+ <msr index='0x0000048e' edx='0x80000000' eax='0x00000000'/>
</feature>
<!-- msr 0x0000048f -->
<feature name='vmx-exit-nosave-debugctl'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x0000048f' edx='0x00000004' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-load-perf-global-ctrl'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00001000'/>
+ <msr index='0x0000048f' edx='0x00001000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-ack-intr'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x0000048f' edx='0x00008000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-save-pat'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00040000'/>
+ <msr index='0x0000048f' edx='0x00040000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-load-pat'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00080000'/>
+ <msr index='0x0000048f' edx='0x00080000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-save-efer'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00100000'/>
+ <msr index='0x0000048f' edx='0x00100000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-load-efer'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00200000'/>
+ <msr index='0x0000048f' edx='0x00200000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-save-preemption-timer'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00400000'/>
+ <msr index='0x0000048f' edx='0x00400000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-clear-bndcfgs'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x00800000'/>
+ <msr index='0x0000048f' edx='0x00800000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-clear-rtit-ctl'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x02000000'/>
+ <msr index='0x0000048f' edx='0x02000000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-load-pkrs'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x20000000'/>
+ <msr index='0x0000048f' edx='0x20000000' eax='0x00000000'/>
</feature>
<feature name='vmx-exit-secondary-ctls'>
- <msr index='0x0000048f' edx='0x00000000' eax='0x80000000'/>
+ <msr index='0x0000048f' edx='0x80000000' eax='0x00000000'/>
</feature>
<!-- msr 0x00000490 -->
<feature name='vmx-entry-noload-debugctl'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x00000490' edx='0x00000004' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-ia32e-mode'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00000200'/>
+ <msr index='0x00000490' edx='0x00000200' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-load-perf-global-ctrl'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00002000'/>
+ <msr index='0x00000490' edx='0x00002000' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-load-pat'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00004000'/>
+ <msr index='0x00000490' edx='0x00004000' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-load-efer'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x00000490' edx='0x00008000' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-load-bndcfgs'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00010000'/>
+ <msr index='0x00000490' edx='0x00010000' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-load-rtit-ctl'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00040000'/>
+ <msr index='0x00000490' edx='0x00040000' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-load-pkrs'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00400000'/>
+ <msr index='0x00000490' edx='0x00400000' eax='0x00000000'/>
</feature>
<feature name='vmx-entry-load-fred'>
- <msr index='0x00000490' edx='0x00000000' eax='0x00800000'/>
+ <msr index='0x00000490' edx='0x00800000' eax='0x00000000'/>
</feature>
<!-- msr 0x00000491 -->
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-2-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-2-enabled.xml
index b2caa79560..d3acea7fb5 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-2-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-2-enabled.xml
@@ -9,11 +9,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x0400006b'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06136bff'/>
+ <msr index='0x48b' edx='0x06136bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c8004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000c204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
index 77613d6071..d9c8a18ddb 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
@@ -9,11 +9,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x0000006b'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000060'/>
- <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/>
+ <msr index='0x48b' edx='0x00136bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c8004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000c204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
index 08609a89a5..27bc5c49b7 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
@@ -10,11 +10,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x000001eb'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000060'/>
- <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
+ <msr index='0x48b' edx='0x00137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c8004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000c204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-enabled.xml
index 8af57fe0df..50ffe707d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-enabled.xml
@@ -11,11 +11,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x1400e06b'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06137bff'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000e204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-enabled.xml
index 433c09590c..1f6363183c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-enabled.xml
@@ -11,11 +11,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x1400e06b'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06137bff'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000e204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
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 424c2492bd..04b63dc586 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
@@ -8,11 +8,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x00000048'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000060'/>
- <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/>
+ <msr index='0x48b' edx='0x001378ff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x00000069'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+ <msr index='0x48d' edx='0x00000069' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c8004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000c204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-enabled.xml
index e9a9bb3ee1..907b0c68fe 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-enabled.xml
@@ -11,11 +11,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x0d00e06b'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06137bff'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000e204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-disabled.xml
index 58f1456f81..5dd24f2d17 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-disabled.xml
@@ -7,4 +7,5 @@
<msr index='0xcf' edx='0x00000000' eax='0x00000020'/>
<msr index='0x10a' edx='0x00000000' eax='0x00000100'/>
<msr index='0x480' edx='0x05000000' eax='0x00000000'/>
+ <msr index='0x48b' edx='0x00000400' eax='0x00000000'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-enabled.xml
index 6e2caa27f5..c70cd4fdef 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-enabled.xml
@@ -12,11 +12,11 @@
<msr index='0x10a' edx='0x40000000' eax='0x0d00e0eb'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06137bff'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x063300c1'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000e204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-enabled.xml
index d4d780d899..84fc093c94 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-enabled.xml
@@ -11,11 +11,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x0c00e0eb'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06137bff'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x063300c1'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000e204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1270-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1270-v5-enabled.xml
index 72bfea23de..27ce9c5910 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1270-v5-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1270-v5-enabled.xml
@@ -8,11 +8,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x08000048'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/>
+ <msr index='0x48b' edx='0x001378ff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x00000069'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x00fc9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0001e204'/>
+ <msr index='0x48d' edx='0x00000069' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x00fc9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0001e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6152-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6152-enabled.xml
index 81421fd0b3..fec5d74fc5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6152-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6152-enabled.xml
@@ -9,11 +9,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x08000048'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x02137bff'/>
+ <msr index='0x48b' edx='0x02137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x00fc9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0001e204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x00fc9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0001e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-enabled.xml
index de6ca528c4..db6cde2570 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-enabled.xml
@@ -10,11 +10,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x0c00e0eb'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06137bff'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x063300c1'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c8004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000c204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
index a8e24f2302..343f055ebf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
@@ -9,11 +9,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x000000eb'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000060'/>
- <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
+ <msr index='0x48b' edx='0x00137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c8004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000c204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Silver-4214R-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Silver-4214R-enabled.xml
index 05da313503..95e74865cc 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Silver-4214R-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Silver-4214R-enabled.xml
@@ -9,11 +9,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x080000eb'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x02137bff'/>
+ <msr index='0x48b' edx='0x02137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x00fc9004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0001e204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x00fc9004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0001e204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-enabled.xml
index de6ca528c4..db6cde2570 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-enabled.xml
@@ -10,11 +10,11 @@
<msr index='0x10a' edx='0x00000000' eax='0x0c00e0eb'/>
<msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
<msr index='0x485' edx='0x00000000' eax='0x20000160'/>
- <msr index='0x48b' edx='0x00000000' eax='0x06137bff'/>
+ <msr index='0x48b' edx='0x06137bff' eax='0x00000000'/>
<msr index='0x48c' edx='0x00000d01' eax='0x063300c1'/>
- <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
- <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
- <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
- <msr index='0x490' edx='0x00000000' eax='0x0000c204'/>
+ <msr index='0x48d' edx='0x000000e9' eax='0x00000000'/>
+ <msr index='0x48e' edx='0xfbf99e8c' eax='0x00000000'/>
+ <msr index='0x48f' edx='0x007c8004' eax='0x00000000'/>
+ <msr index='0x490' edx='0x0000c204' eax='0x00000000'/>
<msr index='0x491' edx='0x00000000' eax='0x00000001'/>
</cpudata>
--
2.45.2On Mon, Nov 24, 2025 at 14:40:30 +0100, Hector Cao wrote: > the vmx-* features are currently decoded from the 32-lower bits > (EAX) of the MSR 64-bit values. They should be decoded instead > from the 32-higher bits (EDX). > --- > src/cpu_map/x86_features.xml | 136 +++++++++--------- > .../x86_64-cpuid-Atom-P5362-2-enabled.xml | 10 +- > .../x86_64-cpuid-Atom-P5362-enabled.xml | 10 +- > .../x86_64-cpuid-Cooperlake-enabled.xml | 10 +- > .../x86_64-cpuid-Core-i7-1270P-enabled.xml | 10 +- > .../x86_64-cpuid-Core-i7-1365U-enabled.xml | 10 +- > .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 10 +- > .../x86_64-cpuid-Xeon-6731E-enabled.xml | 10 +- > .../x86_64-cpuid-Xeon-6788P-disabled.xml | 1 + > .../x86_64-cpuid-Xeon-6788P-enabled.xml | 10 +- > ...x86_64-cpuid-Xeon-Bronze-3408U-enabled.xml | 10 +- > .../x86_64-cpuid-Xeon-E3-1270-v5-enabled.xml | 10 +- > .../x86_64-cpuid-Xeon-Gold-6152-enabled.xml | 10 +- > .../x86_64-cpuid-Xeon-Gold-6530-enabled.xml | 10 +- > ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 10 +- > ...x86_64-cpuid-Xeon-Silver-4214R-enabled.xml | 10 +- > .../x86_64-cpuid-Xeon-w7-3465X-enabled.xml | 10 +- > 17 files changed, 144 insertions(+), 143 deletions(-) The following patch needs to be squashed in to make sure tests pass after each commit. I even tried splitting this differently and just update the x86_features.xml, but that fails in different ways. Thus I don't see a reasonable way to split the changes into multiple commits. Jirka
© 2016 - 2025 Red Hat, Inc.