Changeset 79695 in vbox

Timestamp:

Jul 11, 2019 12:41:19 PM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Build fix.

File:

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

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

@@ -16199 +16199 @@
         if (VMX_IDT_VECTORING_INFO_IS_VALID(pVmxTransient->uIdtVectoringInfo))
         {
-            uint32_t       uErrCode;
-            RTGCUINTPTR    GCPtrFaultAddress;
-            uint32_t const uIntType        = VMX_IDT_VECTORING_INFO_TYPE(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)
+            uint32_t uErrCode;
+            if (VMX_IDT_VECTORING_INFO_IS_ERROR_CODE_VALID(pVmxTransient->uIdtVectoringInfo))
             {
                 rc = hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);
@@ -16213 +16209 @@
                 uErrCode = 0;
 
+            RTGCUINTPTR GCPtrFaultAddress;
             if (VMX_IDT_VECTORING_INFO_IS_XCPT_PF(pVmxTransient->uIdtVectoringInfo))
                 GCPtrFaultAddress = pVCpu->cpum.GstCtx.cr2;
@@ -16224 +16221 @@
                                    pVmxTransient->cbInstr, uErrCode, GCPtrFaultAddress);
 
-            Log4Func(("Pending event. uIntType=%#x uVector=%#x\n", uIntType, uVector));
+            Log4Func(("Pending event. uIntType=%#x uVector=%#x\n", VMX_IDT_VECTORING_INFO_TYPE(pVmxTransient->uIdtVectoringInfo),
+                      VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo)));
             STAM_COUNTER_INC(&pVCpu->hm.s.StatExitTaskSwitch);
             return VINF_EM_RAW_INJECT_TRPM_EVENT;