Changeset 74360 in vbox for trunk

Timestamp:

Sep 19, 2018 8:43:05 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Use VMX_ENTRY macros now that we have them in places where we are dealing with VM-entry interruption information.
Makes code easier to use despite the macros being mostly the same.

File:

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

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

@@ -7683 +7683 @@
          * See Intel spec. 26.6.5 "Interrupt-Window Exiting and Virtual-Interrupt Delivery".
          */
-        uint32_t const uIntType = VMX_EXIT_INT_INFO_TYPE(pVCpu->hm.s.Event.u64IntInfo);
+        uint32_t const uIntType = VMX_ENTRY_INT_INFO_TYPE(pVCpu->hm.s.Event.u64IntInfo);
 #ifdef VBOX_STRICT
-        if (uIntType == VMX_EXIT_INT_INFO_TYPE_EXT_INT)
+        if (uIntType == VMX_ENTRY_INT_INFO_TYPE_EXT_INT)
         {
             bool const fBlockInt = !(pCtx->eflags.u32 & X86_EFL_IF);
@@ -7692 +7692 @@
             Assert(!fBlockMovSS);
         }
-        else if (uIntType == VMX_EXIT_INT_INFO_TYPE_NMI)
+        else if (uIntType == VMX_ENTRY_INT_INFO_TYPE_NMI)
         {
             bool const fBlockNmi = RT_BOOL(fIntrState & VMX_VMCS_GUEST_INT_STATE_BLOCK_NMI);
@@ -7712 +7712 @@
         fBlockSti   = RT_BOOL(fIntrState & VMX_VMCS_GUEST_INT_STATE_BLOCK_STI);
 
-        if (uIntType == VMX_EXIT_INT_INFO_TYPE_EXT_INT)
+        if (uIntType == VMX_ENTRY_INT_INFO_TYPE_EXT_INT)
             STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterrupt);
         else
@@ -7872 +7872 @@
     PCPUMCTX       pCtx       = &pVCpu->cpum.GstCtx;
     uint32_t       u32IntInfo = (uint32_t)u64IntInfo;
-    uint32_t const uVector    = VMX_EXIT_INT_INFO_VECTOR(u32IntInfo);
-    uint32_t const uIntType   = VMX_EXIT_INT_INFO_TYPE(u32IntInfo);
+    uint32_t const uVector    = VMX_ENTRY_INT_INFO_VECTOR(u32IntInfo);
+    uint32_t const uIntType   = VMX_ENTRY_INT_INFO_TYPE(u32IntInfo);
 
 #ifdef VBOX_STRICT
@@ -7894 +7894 @@
             case X86_XCPT_GP:
             case X86_XCPT_AC:
-                AssertMsg(VMX_EXIT_INT_INFO_IS_ERROR_CODE_VALID(u32IntInfo),
+                AssertMsg(VMX_ENTRY_INT_INFO_IS_ERROR_CODE_VALID(u32IntInfo),
                           ("Error-code-valid bit not set for exception that has an error code uVector=%#x\n", uVector));
                 RT_FALL_THRU();
@@ -7927 +7927 @@
              * See Intel spec. 26.2.1.3 "VM-Entry Control Fields".
              */
-            u32IntInfo &= ~VMX_EXIT_INT_INFO_ERROR_CODE_VALID;
+            u32IntInfo &= ~VMX_ENTRY_INT_INFO_ERROR_CODE_VALID;
         }
         else
@@ -7963 +7963 @@
             /* Software exceptions (#BP and #OF exceptions thrown as a result of INT3 or INTO) */
             uint16_t uGuestIp = pCtx->ip;
-            if (uIntType == VMX_EXIT_INT_INFO_TYPE_SW_XCPT)
+            if (uIntType == VMX_ENTRY_INT_INFO_TYPE_SW_XCPT)
             {
                 Assert(uVector == X86_XCPT_BP || uVector == X86_XCPT_OF);
@@ -7969 +7969 @@
                 uGuestIp = pCtx->ip + (uint16_t)cbInstr;
             }
-            else if (uIntType == VMX_EXIT_INT_INFO_TYPE_SW_INT)
+            else if (uIntType == VMX_ENTRY_INT_INFO_TYPE_SW_INT)
                 uGuestIp = pCtx->ip + (uint16_t)cbInstr;
 
@@ -7994 +7994 @@
                 pCtx->cs.ValidSel = IdtEntry.uSel;
                 pCtx->cs.u64Base  = IdtEntry.uSel << cbIdtEntry;
-                if (   uIntType == VMX_EXIT_INT_INFO_TYPE_HW_XCPT
+                if (   uIntType == VMX_ENTRY_INT_INFO_TYPE_HW_XCPT
                     && uVector  == X86_XCPT_PF)
                     pCtx->cr2 = GCPtrFaultAddress;
@@ -8007 +8007 @@
                 if (*pfIntrState & VMX_VMCS_GUEST_INT_STATE_BLOCK_STI)
                 {
-                    Assert(   uIntType != VMX_EXIT_INT_INFO_TYPE_NMI
-                           && uIntType != VMX_EXIT_INT_INFO_TYPE_EXT_INT);
+                    Assert(   uIntType != VMX_ENTRY_INT_INFO_TYPE_NMI
+                           && uIntType != VMX_ENTRY_INT_INFO_TYPE_EXT_INT);
                     Log4Func(("Clearing inhibition due to STI\n"));
                     *pfIntrState &= ~VMX_VMCS_GUEST_INT_STATE_BLOCK_STI;
@@ -8035 +8035 @@
     /* Inject. */
     int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, u32IntInfo);
-    if (VMX_EXIT_INT_INFO_IS_ERROR_CODE_VALID(u32IntInfo))
+    if (VMX_ENTRY_INT_INFO_IS_ERROR_CODE_VALID(u32IntInfo))
         rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_EXCEPTION_ERRCODE, u32ErrCode);
     rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_INSTR_LENGTH, cbInstr);
@@ -8041 +8041 @@
 
     /* Update CR2. */
-    if (   VMX_EXIT_INT_INFO_TYPE(u32IntInfo) == VMX_EXIT_INT_INFO_TYPE_HW_XCPT
+    if (   VMX_ENTRY_INT_INFO_TYPE(u32IntInfo) == VMX_EXIT_INT_INFO_TYPE_HW_XCPT
         && uVector == X86_XCPT_PF)
         pCtx->cr2 = GCPtrFaultAddress;