Changeset 79692 in vbox

Timestamp:

Jul 11, 2019 12:19:31 PM (6 years ago)

Author:

vboxsync

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

132028

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Consistency, nits.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -9128 +9128 @@
     uint32_t const    cbInstr    = pEvent->cbInstr;
     RTGCUINTPTR const GCPtrFault = pEvent->GCPtrFaultAddress;
-    uint32_t const    uVector    = VMX_ENTRY_INT_INFO_VECTOR(u32IntInfo);
+    uint8_t const     uVector    = VMX_ENTRY_INT_INFO_VECTOR(u32IntInfo);
     uint32_t const    uIntType   = VMX_ENTRY_INT_INFO_TYPE(u32IntInfo);
 
@@ -14804 +14804 @@
 
     /* We should never call this function for a page-fault, we'd need to pass on the fault address below otherwise. */
-    Assert(   uVector != X86_XCPT_PF
-           || VMX_EXIT_INT_INFO_TYPE(pVmxTransient->uExitIntInfo) != VMX_EXIT_INT_INFO_TYPE_HW_XCPT);
+    Assert(!VMX_EXIT_INT_INFO_IS_XCPT_PF(pVmxTransient->uExitIntInfo));
     NOREF(uVector);
 
@@ -16203 +16202 @@
             RTGCUINTPTR    GCPtrFaultAddress;
             uint32_t const uIntType        = VMX_IDT_VECTORING_INFO_TYPE(pVmxTransient->uIdtVectoringInfo);
-            uint32_t const uVector         = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
+            uint8_t const  uVector         = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
             bool const     fErrorCodeValid = VMX_IDT_VECTORING_INFO_IS_ERROR_CODE_VALID(pVmxTransient->uIdtVectoringInfo);
             if (fErrorCodeValid)
@@ -16214 +16213 @@
                 uErrCode = 0;
 
-            if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
-                && uVector == X86_XCPT_PF)
+            if (VMX_IDT_VECTORING_INFO_IS_XCPT_PF(pVmxTransient->uIdtVectoringInfo))
                 GCPtrFaultAddress = pVCpu->cpum.GstCtx.cr2;
             else