Changeset 45705 in vbox for trunk/src/VBox

Timestamp:

Apr 24, 2013 2:37:42 PM (12 years ago)

Author:

vboxsync

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

85251

Message:

Retired SELMR3DisableMonitoring.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/HM.cpp (modified) (1 diff)
• VMMR3/SELM.cpp (modified) (4 diffs)
• include/SELMInternal.h (modified) (1 diff)

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

@@ -839 +839 @@
 #ifdef VBOX_WITH_RAW_MODE
     /* Turn off IDT/LDT/GDT and TSS monitoring and sycing. */
-    SELMR3DisableMonitoring(pVM);
     TRPMR3DisableMonitoring(pVM);
 #endif

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

@@ -179 +179 @@
     pVM->selm.s.GCSelTss           = RTSEL_MAX;
 
-    pVM->selm.s.fDisableMonitoring = false;
     pVM->selm.s.fSyncTSSRing0Stack = false;
 
@@ -632 +631 @@
 
 
-#ifdef VBOX_WITH_RAW_MODE
-/**
- * Disable GDT/LDT/TSS monitoring and syncing
- *
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(void) SELMR3DisableMonitoring(PVM pVM)
-{
-    /*
-     * Uninstall guest GDT/LDT/TSS write access handlers.
-     */
-    int rc;
-    if (pVM->selm.s.GuestGdtr.pGdt != RTRCPTR_MAX && pVM->selm.s.fGDTRangeRegistered)
-    {
-# ifdef SELM_TRACK_GUEST_GDT_CHANGES
-        rc = PGMHandlerVirtualDeregister(pVM, pVM->selm.s.GuestGdtr.pGdt);
-        AssertRC(rc);
-# endif
-        pVM->selm.s.GuestGdtr.pGdt = RTRCPTR_MAX;
-        pVM->selm.s.GuestGdtr.cbGdt = 0;
-    }
-    pVM->selm.s.fGDTRangeRegistered = false;
-    if (pVM->selm.s.GCPtrGuestLdt != RTRCPTR_MAX)
-    {
-# ifdef SELM_TRACK_GUEST_LDT_CHANGES
-        rc = PGMHandlerVirtualDeregister(pVM, pVM->selm.s.GCPtrGuestLdt);
-        AssertRC(rc);
-# endif
-        pVM->selm.s.GCPtrGuestLdt = RTRCPTR_MAX;
-    }
-    if (pVM->selm.s.GCPtrGuestTss != RTRCPTR_MAX)
-    {
-# ifdef SELM_TRACK_GUEST_TSS_CHANGES
-        rc = PGMHandlerVirtualDeregister(pVM, pVM->selm.s.GCPtrGuestTss);
-        AssertRC(rc);
-# endif
-        pVM->selm.s.GCPtrGuestTss = RTRCPTR_MAX;
-        pVM->selm.s.GCSelTss      = RTSEL_MAX;
-    }
-
-    /*
-     * Unregister shadow GDT/LDT/TSS write access handlers.
-     */
-# ifdef SELM_TRACK_SHADOW_GDT_CHANGES
-    if (pVM->selm.s.paGdtRC != NIL_RTRCPTR)
-    {
-        rc = PGMHandlerVirtualDeregister(pVM, pVM->selm.s.paGdtRC);
-        AssertRC(rc);
-        pVM->selm.s.paGdtRC = NIL_RTRCPTR;
-    }
-# endif
-# ifdef SELM_TRACK_SHADOW_TSS_CHANGES
-    if (pVM->selm.s.pvMonShwTssRC != RTRCPTR_MAX)
-    {
-        rc = PGMHandlerVirtualDeregister(pVM, pVM->selm.s.pvMonShwTssRC);
-        AssertRC(rc);
-        pVM->selm.s.pvMonShwTssRC = RTRCPTR_MAX;
-    }
-# endif
-# ifdef SELM_TRACK_SHADOW_LDT_CHANGES
-    if (pVM->selm.s.pvLdtRC != RTRCPTR_MAX)
-    {
-        rc = PGMHandlerVirtualDeregister(pVM, pVM->selm.s.pvLdtRC);
-        AssertRC(rc);
-        pVM->selm.s.pvLdtRC = RTRCPTR_MAX;
-    }
-# endif
-
-    PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies on VCPU */
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
-
-    pVM->selm.s.fDisableMonitoring = true;
-}
-#endif /* VBOX_WITH_RAW_MODE */
-
-
 /**
  * Execute state save operation.
@@ -726 +647 @@
     PSELM pSelm = &pVM->selm.s;
 
-    SSMR3PutBool(pSSM, pSelm->fDisableMonitoring);
+    SSMR3PutBool(pSSM, HMIsEnabled(pVM));
     SSMR3PutBool(pSSM, pSelm->fSyncTSSRing0Stack);
     SSMR3PutSel(pSSM, pSelm->aHyperSel[SELM_HYPER_SEL_CS]);
@@ -766 +687 @@
 
     /* Get the monitoring flag. */
-    SSMR3GetBool(pSSM, &pVM->selm.s.fDisableMonitoring);
+    bool fIgnored;
+    SSMR3GetBool(pSSM, &fIgnored);
 
     /* Get the TSS state flag. */

trunk/src/VBox/VMM/include/SELMInternal.h

@@ -167 +167 @@
     bool                    fGDTRangeRegistered;
 
-    /** Indicates whether LDT/GDT/TSS monitoring and syncing is disabled. */
-    bool                    fDisableMonitoring;
-
     /** Indicates whether the TSS stack selector & base address need to be refreshed.  */
     bool                    fSyncTSSRing0Stack;
-    bool                    fPadding2[1+2];
+    bool                    fPadding2[4];
 
     /** SELMR3UpdateFromCPUM() profiling. */