cpu_map: update vmx-* features

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).

Signed-off-by: Hector Cao <hector.cao@canonical.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 5220a3d172b4ca12bfa319135a5a25384d0834b1..2a2ac57f90763501942ef59133971d73d9d70b10 100644 (file)
--- 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 b2caa795602c4522d6b6aa2b06a07e134825efdb..d3acea7fb5e1ca348a396cdfdeff371a861faa23 100644 (file)
--- 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 77613d60714c72196f1369aa29dc49f598a535c8..d9c8a18ddbfeae268c6f1ccc354828685516cf07 100644 (file)
--- 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 08609a89a5fae5f8e96163ea02b2048579c6bde8..27bc5c49b7ff7f3ae0b86a462e435eff7dbe7234 100644 (file)
--- 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 8af57fe0df9013b940b3eb8231802bbe845367a2..50ffe707d1a05fc9a73d30bdc41c6706ec688c57 100644 (file)
--- 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 433c09590c3695319e23764a7fe259fa288a311d..1f6363183cc1cc3077899f4080cdd87df347e63f 100644 (file)
--- 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 424c2492bde80a129c80549ce920f3ca1f8553d9..04b63dc586177f2099eb0b1f7b0975c960a10735 100644 (file)
--- 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 e9a9bb3ee13521797c8929cb5ce42bf34892987c..907b0c68fe73e436f7cc467312be41ff7996c530 100644 (file)
--- 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 58f1456f819a0636748e7b6890f020387415d931..5dd24f2d17009af8dc3741fe0fb9bb6b5343951c 100644 (file)
--- 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 6e2caa27f591cd53b724b0fa4fc85bad57705ba4..c70cd4fdef599a370466585b87ea65cfb8c132de 100644 (file)
--- 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-6788P-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-guest.xml
index 8b651338ec3a2b52f02ba0f6aaebc7ed14efed6e..f5d80aebf8a49d1fe0dfe6b40324f0f69276e0ce 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-guest.xml
@@ -55,6 +55,7 @@
   <feature policy='require' name='rfds-no'/>
   <feature policy='require' name='vmx-any-errcode'/>
   <feature policy='require' name='vmx-nested-exception'/>
+  <feature policy='require' name='vmx-ple'/>
   <feature policy='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
   <feature policy='disable' name='taa-no'/>
@@ -63,16 +64,7 @@
   <feature policy='disable' name='vmx-store-lma'/>
   <feature policy='disable' name='vmx-activity-hlt'/>
   <feature policy='disable' name='vmx-vmwrite-vmexit-fields'/>
-  <feature policy='disable' name='vmx-apicv-xapic'/>
-  <feature policy='disable' name='vmx-ept'/>
-  <feature policy='disable' name='vmx-desc-exit'/>
-  <feature policy='disable' name='vmx-rdtscp-exit'/>
-  <feature policy='disable' name='vmx-apicv-x2apic'/>
-  <feature policy='disable' name='vmx-vpid'/>
-  <feature policy='disable' name='vmx-wbinvd-exit'/>
-  <feature policy='disable' name='vmx-unrestricted-guest'/>
   <feature policy='disable' name='vmx-apicv-register'/>
-  <feature policy='disable' name='vmx-apicv-vid'/>
   <feature policy='disable' name='vmx-rdrand-exit'/>
   <feature policy='disable' name='vmx-invpcid-exit'/>
   <feature policy='disable' name='vmx-vmfunc'/>
@@ -99,6 +91,11 @@
   <feature policy='disable' name='vmx-vintr-pending'/>
   <feature policy='disable' name='vmx-tsc-offset'/>
   <feature policy='disable' name='vmx-hlt-exit'/>
+  <feature policy='disable' name='vmx-invlpg-exit'/>
+  <feature policy='disable' name='vmx-mwait-exit'/>
+  <feature policy='disable' name='vmx-rdpmc-exit'/>
+  <feature policy='disable' name='vmx-rdtsc-exit'/>
+  <feature policy='disable' name='vmx-cr3-load-noexit'/>
   <feature policy='disable' name='vmx-cr3-store-noexit'/>
   <feature policy='disable' name='vmx-cr8-load-exit'/>
   <feature policy='disable' name='vmx-cr8-store-exit'/>
@@ -112,6 +109,7 @@
   <feature policy='disable' name='vmx-monitor-exit'/>
   <feature policy='disable' name='vmx-pause-exit'/>
   <feature policy='disable' name='vmx-secondary-ctls'/>
+  <feature policy='disable' name='vmx-exit-nosave-debugctl'/>
   <feature policy='disable' name='vmx-exit-load-perf-global-ctrl'/>
   <feature policy='disable' name='vmx-exit-ack-intr'/>
   <feature policy='disable' name='vmx-exit-save-pat'/>
@@ -119,6 +117,7 @@
   <feature policy='disable' name='vmx-exit-save-efer'/>
   <feature policy='disable' name='vmx-exit-load-efer'/>
   <feature policy='disable' name='vmx-exit-save-preemption-timer'/>
+  <feature policy='disable' name='vmx-entry-noload-debugctl'/>
   <feature policy='disable' name='vmx-entry-ia32e-mode'/>
   <feature policy='disable' name='vmx-entry-load-perf-global-ctrl'/>
   <feature policy='disable' name='vmx-entry-load-pat'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml
index e0419f91bdac6552977f4f92892a594b8c1b2f9d..55fd746133482b69dbec34e026b306e8f4b48e42 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml
@@ -89,13 +89,16 @@
   <feature name='rfds-no'/>
   <feature name='vmx-any-errcode'/>
   <feature name='vmx-nested-exception'/>
+  <feature name='vmx-apicv-xapic'/>
+  <feature name='vmx-ept'/>
+  <feature name='vmx-desc-exit'/>
+  <feature name='vmx-rdtscp-exit'/>
+  <feature name='vmx-apicv-x2apic'/>
+  <feature name='vmx-vpid'/>
+  <feature name='vmx-wbinvd-exit'/>
+  <feature name='vmx-unrestricted-guest'/>
+  <feature name='vmx-apicv-vid'/>
+  <feature name='vmx-ple'/>
   <feature name='vmx-invept-single-context'/>
   <feature name='vmx-invept-all-context'/>
-  <feature name='vmx-invlpg-exit'/>
-  <feature name='vmx-mwait-exit'/>
-  <feature name='vmx-rdpmc-exit'/>
-  <feature name='vmx-rdtsc-exit'/>
-  <feature name='vmx-cr3-load-noexit'/>
-  <feature name='vmx-exit-nosave-debugctl'/>
-  <feature name='vmx-entry-noload-debugctl'/>
 </cpu>

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 d4d780d899db5341322ea7e3222736809a20f0be..84fc093c94caa4e98919305d9c172f12ef480af6 100644 (file)
--- 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 72bfea23def07b99eeafa38f570273ec89a461eb..27ce9c59107145d590782b7eba4ce63d25a0b206 100644 (file)
--- 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 81421fd0b3e49b516b281883c0ae47308de95e09..fec5d74fc5f57ce0921830f9a0cafc04343e28ad 100644 (file)
--- 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 de6ca528c42464564fdf54f95bc286c89e9b7593..db6cde257089e671de9514c32063d7670f478110 100644 (file)
--- 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 a8e24f23021991fe11d45681a4154f1a2b31a6cf..343f055ebfc33b3c20bf8a2c6e6bf4b2d6d6e406 100644 (file)
--- 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 05da3135036af1ba3e6e2a5040f19350a6016a7a..95e74865ccfb31f3b90d27fabff7aa23beefee8e 100644 (file)
--- 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 de6ca528c42464564fdf54f95bc286c89e9b7593..db6cde257089e671de9514c32063d7670f478110 100644 (file)
--- 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>