Changeset 44096 in vbox

Timestamp:

Dec 11, 2012 3:01:52 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: naming.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (3 diffs)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (13 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1016 +1016 @@
  * @{
  */
-#define VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT             0
+#define VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT         0
 #define VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI             2
-#define VMX_EXIT_INTERRUPTION_INFO_TYPE_HWEXCPT         3
-#define VMX_EXIT_INTERRUPTION_INFO_TYPE_SW              4 /**< int xx */
-#define VMX_EXIT_INTERRUPTION_INFO_TYPE_DBEXCPT         5 /**< Why are we getting this one?? */
-#define VMX_EXIT_INTERRUPTION_INFO_TYPE_SWEXCPT         6
+#define VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT         3
+#define VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT          4 /**< int xx */
+#define VMX_EXIT_INTERRUPTION_INFO_TYPE_DB_XCPT         5 /**< Why are we getting this one?? */
+#define VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT         6
 /** @} */
 
@@ -1105 +1105 @@
 #define VMX_VMCS_RO_IO_RDI                                      0x6406
 #define VMX_VMCS_RO_IO_RIP                                      0x6408
-#define VMX_VMCS_EXIT_GUEST_LINEAR_ADDR                         0x640A
+#define VMX_VMCS_RO_EXIT_GUEST_LINEAR_ADDR                      0x640A
 /** @} */
 
@@ -1176 +1176 @@
 /** Task switch caused by an interrupt gate. */
 #define VMX_EXIT_QUALIFICATION_TASK_SWITCH_TYPE_IDT     3
-
 /** @} */
 

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

@@ -884 +884 @@
     {
         LogFlow(("INJ-EI: %x at %RGv\n", iGate, (RTGCPTR)pCtx->rip));
-        Assert(   VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW
+        Assert(   VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT
                || !VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
-        Assert(   VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW
+        Assert(   VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT
                || pCtx->eflags.u32 & X86_EFL_IF);
     }
@@ -920 +920 @@
                 intInfo2 |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
                 intInfo2 |= VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_VALID;
-                intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_HWEXCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
 
                 return hmR0VmxInjectEvent(pVM, pVCpu, pCtx, intInfo2, 0, 0 /* no error code according to the Intel docs */);
@@ -927 +927 @@
             return VINF_EM_RESET;
         }
-        if (    VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW
+        if (    VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT
             ||  iGate == 3 /* Both #BP and #OF point to the instruction after. */
             ||  iGate == 4)
@@ -1134 +1134 @@
                 || u8Vector == X86_XCPT_OF)
             {
-                intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SWEXCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
             }
             else
-                intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_HWEXCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
         }
         else
-            intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+            intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
 
         STAM_COUNTER_INC(&pVCpu->hm.s.StatIntInject);
@@ -1173 +1173 @@
         switch (VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo))
         {
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT:
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT:
         case VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI:
             enmTrapType = TRPM_HARDWARE_INT;
             break;
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SW:
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SWEXCPT:
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_DBEXCPT:
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT:
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT:
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_DB_XCPT:
             enmTrapType = TRPM_SOFTWARE_INT;
             break;
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_HWEXCPT:
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT:
             enmTrapType = TRPM_TRAP;
             break;
@@ -3335 +3335 @@
     if (    VMX_EXIT_INTERRUPTION_INFO_VALID(pVCpu->hm.s.Event.u64IntrInfo)
         /* Ignore 'int xx' as they'll be restarted anyway. */
-        &&  VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo) != VMX_EXIT_INTERRUPTION_INFO_TYPE_SW
+        &&  VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo) != VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT
         /* Ignore software exceptions (such as int3) as they'll reoccur when we restart the instruction anyway. */
-        &&  VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo) != VMX_EXIT_INTERRUPTION_INFO_TYPE_SWEXCPT)
+        &&  VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo) != VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT)
     {
         Assert(!pVCpu->hm.s.Event.fPending);
@@ -3360 +3360 @@
     else if (   VMX_EXIT_INTERRUPTION_INFO_VALID(pVCpu->hm.s.Event.u64IntrInfo)
                 /* Ignore software exceptions (such as int3) as they're reoccur when we restart the instruction anyway. */
-             && VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SWEXCPT)
+             && VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT)
     {
         Log(("Ignore pending inject %RX64 at %RGv exit=%08x intInfo=%08x exitQualification=%RGv\n",
@@ -3411 +3411 @@
         switch (VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo))
         {
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI:   /* Non-maskable interrupt. */
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI:       /* Non-maskable interrupt. */
             /* External interrupt; leave to allow it to be dispatched again. */
             rc = VINF_EM_RAW_INTERRUPT;
             break;
 
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT:   /* External hardware interrupt. */
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT:   /* External hardware interrupt. */
             AssertFailed(); /* can't come here; fails the first check. */
             break;
 
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_DBEXCPT:   /* Unknown why we get this type for #DB */
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SWEXCPT:   /* Software exception. (#BP or #OF) */
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_DB_XCPT:   /* Unknown why we get this type for #DB */
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT:   /* Software exception. (#BP or #OF) */
             Assert(vector == 1 || vector == 3 || vector == 4);
             /* no break */
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_HWEXCPT:   /* Hardware exception. */
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT:   /* Hardware exception. */
             Log2(("Hardware/software interrupt %d\n", vector));
             switch (vector)
@@ -3870 +3870 @@
                             intInfo2  = pDis->Param1.uValue & 0xff;
                             intInfo2 |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
-                            intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                            intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
 
                             rc = hmR0VmxInjectEvent(pVM, pVCpu, pCtx, intInfo2, cbOp, 0);
@@ -3888 +3888 @@
                                 intInfo2  = X86_XCPT_OF;
                                 intInfo2 |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
-                                intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                                intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
 
                                 rc = hmR0VmxInjectEvent(pVM, pVCpu, pCtx, intInfo2, cbOp, 0);
@@ -3905 +3905 @@
                             intInfo2  = 3;
                             intInfo2 |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
-                            intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                            intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
 
                             rc = hmR0VmxInjectEvent(pVM, pVCpu, pCtx, intInfo2, cbOp, 0);
@@ -4483 +4483 @@
 
             /* Disassemble manually to deal with segment prefixes. */
-            /** @todo VMX_VMCS_EXIT_GUEST_LINEAR_ADDR contains the flat pointer operand of the instruction. */
+            /** @todo VMX_VMCS_RO_EXIT_GUEST_LINEAR_ADDR contains the flat pointer
+             *        operand of the instruction. */
             /** @todo VMX_VMCS32_RO_EXIT_INSTR_INFO also contains segment prefix info. */
             rc2 = EMInterpretDisasCurrent(pVM, pVCpu, pDis, NULL);
@@ -4589 +4590 @@
                             intInfo  = X86_XCPT_DB;
                             intInfo |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
-                            intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_HWEXCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                            intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
 
                             Log(("Inject IO debug trap at %RGv\n", (RTGCPTR)pCtx->rip));