Changeset 82817 in vbox

Timestamp:

Jan 22, 2020 4:17:26 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135786

Message:

VMM/IEM: Nested VMX: bugref:9180 Use x2APIC range defines from x86.h now that it's no longer different from what was specified in the VT-x spec prior to Jan 2019.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -3424 +3424 @@
 /** The size of the Virtual-APIC page (in pages). */
 #define VMX_V_VIRT_APIC_PAGES                                   1
-
-/** Virtual X2APIC MSR range start. */
-#define VMX_V_VIRT_APIC_MSR_START                               0x800
-/** Virtual X2APIC MSR range end. */
-#define VMX_V_VIRT_APIC_MSR_END                                 0x8ff
 
 /** The size of the VMREAD/VMWRITE bitmap (in bytes). */

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -4361 +4361 @@
     if (pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_APIC_REG_VIRT)
     {
-        /*
-         * Intel has different ideas in the x2APIC spec. vs the VT-x spec. as to
-         * what the end of the valid x2APIC MSR range is. Hence the use of different
-         * macros here.
-         *
-         * See Intel spec. 10.12.1.2 "x2APIC Register Address Space".
-         * See Intel spec. 29.5 "Virtualizing MSR-based APIC Accesses".
-         */
-        if (   idMsr >= VMX_V_VIRT_APIC_MSR_START
-            && idMsr <= VMX_V_VIRT_APIC_MSR_END)
+        if (   idMsr >= MSR_IA32_X2APIC_START
+            && idMsr <= MSR_IA32_X2APIC_END)
         {
             uint16_t const offReg   = (idMsr & 0xff) << 4;