Changeset 52141 in vbox

Timestamp:

Jul 23, 2014 5:20:39 AM (11 years ago)

Author:

vboxsync

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

95173

Message:

VMM/HMVMXR0: Less confusing variable name.

File:

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

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

@@ -5784 +5784 @@
         AssertRCReturn(rc, rc);
 
-        uint32_t uIntType    = VMX_IDT_VECTORING_INFO_TYPE(pVmxTransient->uIdtVectoringInfo);
-        uint32_t uIdtVector  = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
+        uint32_t uIdtVectorType = VMX_IDT_VECTORING_INFO_TYPE(pVmxTransient->uIdtVectoringInfo);
+        uint32_t uIdtVector     = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
 
         typedef enum
@@ -5799 +5799 @@
         if (VMX_EXIT_INTERRUPTION_INFO_IS_VALID(pVmxTransient->uExitIntInfo))
         {
-            if (uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT)
+            if (uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT)
             {
                 enmReflect = VMXREFLECTXCPT_XCPT;
@@ -5825 +5825 @@
                     enmReflect = VMXREFLECTXCPT_TF;
             }
-            else if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
-                     || uIntType == VMX_IDT_VECTORING_INFO_TYPE_EXT_INT
-                     || uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI)
+            else if (   uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
+                     || uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_EXT_INT
+                     || uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_NMI)
             {
                 /*
@@ -5836 +5836 @@
             }
         }
-        else if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
-                 || uIntType == VMX_IDT_VECTORING_INFO_TYPE_EXT_INT
-                 || uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI)
+        else if (   uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
+                 || uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_EXT_INT
+                 || uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_NMI)
         {
             /*
@@ -5855 +5855 @@
          * See Intel spec. 30.7.1.2 "Resuming Guest Software after Handling an Exception". See @bugref{7445}.
          */
-        if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI
+        if (   uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_NMI
             && enmReflect == VMXREFLECTXCPT_XCPT
             && (pVCpu->hm.s.vmx.u32PinCtls & VMX_VMCS_CTRL_PIN_EXEC_VIRTUAL_NMI)
@@ -5867 +5867 @@
             case VMXREFLECTXCPT_XCPT:
             {
-                Assert(   uIntType != VMX_IDT_VECTORING_INFO_TYPE_SW_INT
-                       && uIntType != VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT
-                       && uIntType != VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT);
+                Assert(   uIdtVectorType != VMX_IDT_VECTORING_INFO_TYPE_SW_INT
+                       && uIdtVectorType != VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT
+                       && uIdtVectorType != VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT);
 
                 uint32_t u32ErrCode = 0;