Changeset 75493 in vbox for trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

Timestamp:

Nov 15, 2018 5:06:55 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref: 9180 Use PGM physical page handler for the APIC-access page.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -1278 +1278 @@
         && CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.s.Guest, VMX_PROC_CTLS2_VIRT_X2APIC_MODE))
     {
-        /** @todo NSTVMX: perhaps IEMExecVmxVirtApicAccessMsr should be moved to
-         *        HMVMXAll.cpp? */
         VBOXSTRICTRC rcStrict = IEMExecVmxVirtApicAccessMsr(pVCpu, idMsr, puValue, false /* fWrite */);
-        Assert(rcStrict == VINF_SUCCESS || rcStrict == VERR_OUT_OF_RANGE || rcStrict == VINF_VMX_INTERCEPT_NOT_ACTIVE);
-        if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
-        {
-            if (rcStrict == VERR_OUT_OF_RANGE)
-                return VERR_CPUM_RAISE_GP_0;
-            Assert(rcStrict == VINF_SUCCESS);
+        if (rcStrict == VINF_VMX_MODIFIES_BEHAVIOR)
             return VINF_SUCCESS;
-        }
+        if (rcStrict == VERR_OUT_OF_RANGE)
+            return VERR_CPUM_RAISE_GP_0;
+        Assert(rcStrict == VINF_VMX_INTERCEPT_NOT_ACTIVE);
     }
 #endif
@@ -1303 +1298 @@
         && CPUMIsGuestVmxProcCtls2Set(pVCpu, &pVCpu->cpum.s.Guest, VMX_PROC_CTLS2_VIRT_X2APIC_MODE))
     {
-        /** @todo NSTVMX: perhaps IEMExecVmxVirtApicAccessMsr should be moved to
-         *        HMVMXAll.cpp? */
         VBOXSTRICTRC rcStrict = IEMExecVmxVirtApicAccessMsr(pVCpu, idMsr, &uValue, true /* fWrite */);
-        Assert(rcStrict == VINF_SUCCESS || rcStrict == VERR_OUT_OF_RANGE || rcStrict == VINF_VMX_INTERCEPT_NOT_ACTIVE);
-        if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
-        {
-            if (rcStrict == VERR_OUT_OF_RANGE)
-                return VERR_CPUM_RAISE_GP_0;
-            Assert(rcStrict == VINF_SUCCESS);
+        if (rcStrict == VINF_VMX_MODIFIES_BEHAVIOR)
             return VINF_SUCCESS;
-        }
+        if (rcStrict == VERR_OUT_OF_RANGE)
+            return VERR_CPUM_RAISE_GP_0;
+        Assert(rcStrict == VINF_VMX_INTERCEPT_NOT_ACTIVE);
     }
 #endif