Changeset 73984 in vbox

Timestamp:

Aug 31, 2018 8:30:50 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HM, IEM: Renamed VMX_EXIT_XDTR_ACCESS and VMX_EXIT_TR_ACCESS.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (8 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1211 +1211 @@
 /** 46 Access to GDTR or IDTR. Guest software attempted to execute LGDT, LIDT,
  *  SGDT, or SIDT. */
-#define VMX_EXIT_XDTR_ACCESS                                    46
+#define VMX_EXIT_GDTR_IDTR_ACCESS                               46
 /** 47 Access to LDTR or TR. Guest software attempted to execute LLDT, LTR,
  *  SLDT, or STR. */
-#define VMX_EXIT_TR_ACCESS                                      47
+#define VMX_EXIT_LDTR_TR_ACCESS                                 47
 /** 48 EPT violation. An attempt to access memory with a guest-physical address
  *  was disallowed by the configuration of the EPT paging structures. */

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -961 +961 @@
     switch (uExitReason)
     {
-        case VMX_EXIT_XDTR_ACCESS:
+        case VMX_EXIT_GDTR_IDTR_ACCESS:
         {
             Assert(VMX_INSTR_ID_IS_VALID(uInstrId));
@@ -969 +969 @@
         }
 
-        case VMX_EXIT_TR_ACCESS:
+        case VMX_EXIT_LDTR_TR_ACCESS:
         {
             Assert(VMX_INSTR_ID_IS_VALID(uInstrId));

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

@@ -419 +419 @@
 static FNVMXEXITHANDLERNSRC hmR0VmxExitTprBelowThreshold;
 static FNVMXEXITHANDLER     hmR0VmxExitApicAccess;
-static FNVMXEXITHANDLER     hmR0VmxExitXdtrAccess;
 static FNVMXEXITHANDLER     hmR0VmxExitXdtrAccess;
 static FNVMXEXITHANDLER     hmR0VmxExitEptViolation;
@@ -509 +508 @@
  /* 44  VMX_EXIT_APIC_ACCESS             */  hmR0VmxExitApicAccess,
  /* 45  UNDEFINED                        */  hmR0VmxExitErrUndefined,
- /* 46  VMX_EXIT_XDTR_ACCESS             */  hmR0VmxExitXdtrAccess,
- /* 47  VMX_EXIT_TR_ACCESS               */  hmR0VmxExitXdtrAccess,
+ /* 46  VMX_EXIT_GDTR_IDTR_ACCESS        */  hmR0VmxExitXdtrAccess,
+ /* 47  VMX_EXIT_LDTR_TR_ACCESS          */  hmR0VmxExitXdtrAccess,
  /* 48  VMX_EXIT_EPT_VIOLATION           */  hmR0VmxExitEptViolation,
  /* 49  VMX_EXIT_EPT_MISCONFIG           */  hmR0VmxExitEptMisconfig,
@@ -9400 +9399 @@
     {
         pDbgState->fCpe2Extra |= VMX_PROC_CTLS2_DESC_TABLE_EXIT;
-        ASMBitSet(pDbgState->bmExitsToCheck, VMX_EXIT_XDTR_ACCESS);
-    }
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_SGDT,               VMX_EXIT_XDTR_ACCESS);
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_SIDT,               VMX_EXIT_XDTR_ACCESS);
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LGDT,               VMX_EXIT_XDTR_ACCESS);
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LIDT,               VMX_EXIT_XDTR_ACCESS);
+        ASMBitSet(pDbgState->bmExitsToCheck, VMX_EXIT_GDTR_IDTR_ACCESS);
+    }
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_SGDT,               VMX_EXIT_GDTR_IDTR_ACCESS);
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_SIDT,               VMX_EXIT_GDTR_IDTR_ACCESS);
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LGDT,               VMX_EXIT_GDTR_IDTR_ACCESS);
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LIDT,               VMX_EXIT_GDTR_IDTR_ACCESS);
 
     if (   IS_EITHER_ENABLED(pVM, INSTR_SLDT)
@@ -9413 +9412 @@
     {
         pDbgState->fCpe2Extra |= VMX_PROC_CTLS2_DESC_TABLE_EXIT;
-        ASMBitSet(pDbgState->bmExitsToCheck, VMX_EXIT_TR_ACCESS);
-    }
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_SLDT,               VMX_EXIT_TR_ACCESS);
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_STR,                VMX_EXIT_TR_ACCESS);
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LLDT,               VMX_EXIT_TR_ACCESS);
-    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LTR,                VMX_EXIT_TR_ACCESS);
+        ASMBitSet(pDbgState->bmExitsToCheck, VMX_EXIT_LDTR_TR_ACCESS);
+    }
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_SLDT,               VMX_EXIT_LDTR_TR_ACCESS);
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_STR,                VMX_EXIT_LDTR_TR_ACCESS);
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LLDT,               VMX_EXIT_LDTR_TR_ACCESS);
+    SET_ONLY_XBM_IF_EITHER_EN( EXIT_LTR,                VMX_EXIT_LDTR_TR_ACCESS);
 
     SET_ONLY_XBM_IF_EITHER_EN(INSTR_VMX_INVEPT,         VMX_EXIT_INVEPT);           /* unconditional */
@@ -9623 +9622 @@
         case VMX_EXIT_MONITOR:          SET_BOTH(MONITOR); break;
         case VMX_EXIT_PAUSE:            SET_BOTH(PAUSE); break;
-        case VMX_EXIT_XDTR_ACCESS:
+        case VMX_EXIT_GDTR_IDTR_ACCESS:
             hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
             switch (RT_BF_GET(pVmxTransient->ExitInstrInfo.u, VMX_BF_XDTR_INSINFO_INSTR_ID))
@@ -9634 +9633 @@
             break;
 
-        case VMX_EXIT_TR_ACCESS:
+        case VMX_EXIT_LDTR_TR_ACCESS:
             hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
             switch (RT_BF_GET(pVmxTransient->ExitInstrInfo.u, VMX_BF_YYTR_INSINFO_INSTR_ID))
@@ -9946 +9945 @@
             case VMX_EXIT_MONITOR:
             case VMX_EXIT_PAUSE:
-            case VMX_EXIT_XDTR_ACCESS:
-            case VMX_EXIT_TR_ACCESS:
+            case VMX_EXIT_GDTR_IDTR_ACCESS:
+            case VMX_EXIT_LDTR_TR_ACCESS:
             case VMX_EXIT_INVEPT:
             case VMX_EXIT_RDTSCP:
@@ -10377 +10376 @@
         case VMX_EXIT_MTF:                     VMEXIT_CALL_RET(0, hmR0VmxExitMtf(pVCpu, pVmxTransient));
         case VMX_EXIT_PAUSE:                   VMEXIT_CALL_RET(0, hmR0VmxExitPause(pVCpu, pVmxTransient));
-        case VMX_EXIT_XDTR_ACCESS:             VMEXIT_CALL_RET(0, hmR0VmxExitXdtrAccess(pVCpu, pVmxTransient));
-        case VMX_EXIT_TR_ACCESS:               VMEXIT_CALL_RET(0, hmR0VmxExitXdtrAccess(pVCpu, pVmxTransient));
+        case VMX_EXIT_GDTR_IDTR_ACCESS:        VMEXIT_CALL_RET(0, hmR0VmxExitXdtrAccess(pVCpu, pVmxTransient));
+        case VMX_EXIT_LDTR_TR_ACCESS:          VMEXIT_CALL_RET(0, hmR0VmxExitXdtrAccess(pVCpu, pVmxTransient));
         case VMX_EXIT_WBINVD:                  VMEXIT_CALL_RET(0, hmR0VmxExitWbinvd(pVCpu, pVmxTransient));
         case VMX_EXIT_XSETBV:                  VMEXIT_CALL_RET(0, hmR0VmxExitXsetbv(pVCpu, pVmxTransient));

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -128 +128 @@
     EXIT_REASON(VMX_EXIT_APIC_ACCESS            ,  44, "APIC access."),
     EXIT_REASON(VMX_EXIT_VIRTUALIZED_EOI        ,  45, "Virtualized EOI."),
-    EXIT_REASON(VMX_EXIT_XDTR_ACCESS            ,  46, "GDTR/IDTR access using LGDT/SGDT/LIDT/SIDT."),
-    EXIT_REASON(VMX_EXIT_TR_ACCESS              ,  47, "LDTR/TR access using LLDT/SLDT/LTR/STR."),
+    EXIT_REASON(VMX_EXIT_GDTR_IDTR_ACCESS       ,  46, "GDTR/IDTR access using LGDT/SGDT/LIDT/SIDT."),
+    EXIT_REASON(VMX_EXIT_LDTR_TR_ACCESS         ,  47, "LDTR/TR access using LLDT/SLDT/LTR/STR."),
     EXIT_REASON(VMX_EXIT_EPT_VIOLATION          ,  48, "EPT violation."),
     EXIT_REASON(VMX_EXIT_EPT_MISCONFIG          ,  49, "EPT misconfiguration."),