Changeset 99765 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 12, 2023 5:07:30 AM (19 months ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10318 Nits.

File:

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

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

@@ -6565 +6565 @@
              * Disallow APIC-access page and virtual-APIC page from being the same address.
              * Note! This is not an Intel requirement, but one imposed by our implementation.
+             * This is done primarily to simplify recursion scenarios while redirecting accesses
+             * between the APIC-access page and the virtual-APIC page. If any nested hypervisor
+             * requires this, we can implement it later
              */
-            /** @todo r=ramshankar: This is done primarily to simplify recursion scenarios while
-             *        redirecting accesses between the APIC-access page and the virtual-APIC
-             *        page. If any nested hypervisor requires this, we can implement it later. */
             if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_USE_TPR_SHADOW)
             {
@@ -7668 +7668 @@
     if (fEntryIntInfoValid)
     {
-        if (VMX_ENTRY_INT_INFO_TYPE(uEntryIntInfo) == VMX_ENTRY_INT_INFO_TYPE_OTHER_EVENT)
+        if (VMX_ENTRY_INT_INFO_TYPE(uEntryIntInfo) != VMX_ENTRY_INT_INFO_TYPE_OTHER_EVENT)
+            iemVmxVmentryInjectTrpmEvent(pVCpu, pszInstr, uEntryIntInfo, pVmcs->u32EntryXcptErrCode, pVmcs->u32EntryInstrLen,
+                                         pVCpu->cpum.GstCtx.cr2);
+        else
         {
             Assert(VMX_ENTRY_INT_INFO_VECTOR(uEntryIntInfo) == VMX_ENTRY_INT_INFO_VECTOR_MTF);
             VMCPU_FF_SET(pVCpu, VMCPU_FF_VMX_MTF);
         }
-        else
-            iemVmxVmentryInjectTrpmEvent(pVCpu, pszInstr, uEntryIntInfo, pVmcs->u32EntryXcptErrCode, pVmcs->u32EntryInstrLen,
-                                         pVCpu->cpum.GstCtx.cr2);
 
         /*