Changeset 48135 in vbox

Timestamp:

Aug 28, 2013 6:04:49 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HM: Eliminate dead code paths.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (5 diffs)
• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (2 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -87 +87 @@
      * @{ */
     DECLR0CALLBACKMEMBER(int,  pfnEnterSession,(PVM pVM, PVMCPU pVCpu, PHMGLOBALCPUINFO pCpu));
-    DECLR0CALLBACKMEMBER(int,  pfnLeaveSession,(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx));
     DECLR0CALLBACKMEMBER(void, pfnThreadCtxCallback,(RTTHREADCTXEVENT enmEvent, PVMCPU pVCpu, bool fGlobalInit));
     DECLR0CALLBACKMEMBER(int,  pfnSaveHostState,(PVM pVM, PVMCPU pVCpu));
@@ -528 +527 @@
                  */
                 g_HvmR0.pfnEnterSession      = VMXR0Enter;
-                g_HvmR0.pfnLeaveSession      = VMXR0Leave;
                 g_HvmR0.pfnThreadCtxCallback = VMXR0ThreadCtxCallback;
                 g_HvmR0.pfnSaveHostState     = VMXR0SaveHostState;
@@ -594 +592 @@
          */
         g_HvmR0.pfnEnterSession      = SVMR0Enter;
-        g_HvmR0.pfnLeaveSession      = SVMR0Leave;
         g_HvmR0.pfnThreadCtxCallback = SVMR0ThreadCtxCallback;
         g_HvmR0.pfnSaveHostState     = SVMR0SaveHostState;
@@ -659 +656 @@
     /* Fill in all callbacks with placeholders. */
     g_HvmR0.pfnEnterSession      = hmR0DummyEnter;
-    g_HvmR0.pfnLeaveSession      = hmR0DummyLeave;
     g_HvmR0.pfnThreadCtxCallback = hmR0DummyThreadCtxCallback;
     g_HvmR0.pfnSaveHostState     = hmR0DummySaveHostState;
@@ -1517 +1513 @@
     ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
 
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Leaves the VT-x or AMD-V session.
- *
- * @returns VBox status code.
- * @param   pVM        Pointer to the VM.
- * @param   pVCpu      Pointer to the VMCPU.
- *
- * @remarks Called with preemption disabled just like HMR0Enter, our
- *          counterpart.
- */
-VMMR0_INT_DECL(int) HMR0Leave(PVM pVM, PVMCPU pVCpu)
-{
-    /* Nothing to do currently. Taken care of HMR0LeaveCpu() and in hmR0VmxLeaveSession() and hmR0SvmLeaveSession(). */
-    /** @todo refactor later to more common code. */
     return VINF_SUCCESS;
 }

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

@@ -1572 +1572 @@
 
 /**
- * Leaves the AMD-V session.
- *
- * @returns VBox status code.
- * @param   pVM         Pointer to the VM.
- * @param   pVCpu       Pointer to the VMCPU.
- * @param   pCtx        Pointer to the guest-CPU context.
- */
-VMMR0DECL(int) SVMR0Leave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    NOREF(pVM);
-    NOREF(pVCpu);
-    NOREF(pCtx);
-
-    /* Nothing to do here. Everything is taken care of in hmR0SvmLeave(). */
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Thread-context callback for AMD-V.
  *
@@ -1945 +1926 @@
 
 
+/**
+ * Leaves the AMD-V session.
+ *
+ * @returns VBox status code.
+ * @param   pVM         Pointer to the VM.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   pCtx        Pointer to the guest-CPU context.
+ */
 DECLINLINE(void) hmR0SvmLeaveSession(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {

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

@@ -6158 +6158 @@
 
 
+/**
+ * Leaves the VT-x session.
+ *
+ * @param   pVM         Pointer to the VM.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   pMixedCtx   Pointer to the guest-CPU context. The data may be
+ *                      out-of-sync. Make sure to update the required fields
+ *                      before using them.
+ *
+ * @remarks No-long-jmp zone!!!
+ */
 DECLINLINE(void) hmR0VmxLeaveSession(PVM pVM, PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
@@ -6993 +7004 @@
             break;
     }
-}
-
-
-/**
- * Leaves the VT-x session.
- *
- * @returns VBox status code.
- * @param   pVM         Pointer to the VM.
- * @param   pVCpu       Pointer to the VMCPU.
- * @param   pCtx        Pointer to the guest-CPU context.
- */
-VMMR0DECL(int) VMXR0Leave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    NOREF(pVCpu);
-    NOREF(pVM);
-    NOREF(pCtx);
-
-    /* Everything is taken care of in hmR0VmxLeave() and VMXR0ThreadCtxCallback()'s preempt event. */
-    return VINF_SUCCESS;
 }
 

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

@@ -939 +939 @@
                     rc = vmmR0CallRing3SetJmp(&pVCpu->vmm.s.CallRing3JmpBufR0, HMR0RunGuestCode, pVM, pVCpu);
 
-                    /* Leave HM context. */
-                    int rc2 = HMR0Leave(pVM, pVCpu);
-                    AssertRC(rc2);
-
                     if (RT_UNLIKELY(   VMCPU_GET_STATE(pVCpu) != VMCPUSTATE_STARTED_HM
                                     && RT_SUCCESS_NP(rc)  && rc !=  VINF_VMM_CALL_HOST ))