Index: /trunk/src/VBox/VMM/VMMR3/SELM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/SELM.cpp	(revision 42370)
+++ /trunk/src/VBox/VMM/VMMR3/SELM.cpp	(revision 42371)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -80,13 +80,4 @@
 #include <iprt/string.h>
 
-
-/**
- * Enable or disable tracking of Guest's GDT/LDT/TSS.
- * @{
- */
-#define SELM_TRACK_GUEST_GDT_CHANGES
-#define SELM_TRACK_GUEST_LDT_CHANGES
-#define SELM_TRACK_GUEST_TSS_CHANGES
-/** @} */
 
 /**
@@ -539,5 +530,4 @@
      */
     int rc;
-#ifdef SELM_TRACK_GUEST_GDT_CHANGES
     if (pVM->selm.s.GuestGdtr.pGdt != RTRCPTR_MAX && pVM->selm.s.fGDTRangeRegistered)
     {
@@ -548,6 +538,4 @@
     }
     pVM->selm.s.fGDTRangeRegistered = false;
-#endif
-#ifdef SELM_TRACK_GUEST_LDT_CHANGES
     if (pVM->selm.s.GCPtrGuestLdt != RTRCPTR_MAX)
     {
@@ -556,6 +544,4 @@
         pVM->selm.s.GCPtrGuestLdt = RTRCPTR_MAX;
     }
-#endif
-#ifdef SELM_TRACK_GUEST_TSS_CHANGES
     if (pVM->selm.s.GCPtrGuestTss != RTRCPTR_MAX)
     {
@@ -565,5 +551,4 @@
         pVM->selm.s.GCSelTss      = RTSEL_MAX;
     }
-#endif
 
     /*
@@ -596,5 +581,4 @@
      */
     int rc;
-#ifdef SELM_TRACK_GUEST_GDT_CHANGES
     if (pVM->selm.s.GuestGdtr.pGdt != RTRCPTR_MAX && pVM->selm.s.fGDTRangeRegistered)
     {
@@ -605,6 +589,4 @@
     }
     pVM->selm.s.fGDTRangeRegistered = false;
-#endif
-#ifdef SELM_TRACK_GUEST_LDT_CHANGES
     if (pVM->selm.s.GCPtrGuestLdt != RTRCPTR_MAX)
     {
@@ -613,6 +595,4 @@
         pVM->selm.s.GCPtrGuestLdt = RTRCPTR_MAX;
     }
-#endif
-#ifdef SELM_TRACK_GUEST_TSS_CHANGES
     if (pVM->selm.s.GCPtrGuestTss != RTRCPTR_MAX)
     {
@@ -622,5 +602,4 @@
         pVM->selm.s.GCSelTss      = RTSEL_MAX;
     }
-#endif
 
     /*
@@ -1040,14 +1019,10 @@
             if (pVM->selm.s.GuestGdtr.cbGdt > GDTR.cbGdt)
                 memset(pGDTE, 0, pVM->selm.s.GuestGdtr.cbGdt - GDTR.cbGdt);
-#ifndef SELM_TRACK_GUEST_GDT_CHANGES
-            pVM->selm.s.GuestGdtr.cbGdt = GDTR.cbGdt;
-#endif
-        }
-
-#ifdef SELM_TRACK_GUEST_GDT_CHANGES
+        }
+
         /*
          * Check if Guest's GDTR is changed.
          */
-        if (    GDTR.pGdt != pVM->selm.s.GuestGdtr.pGdt
+        if (    GDTR.pGdt  != pVM->selm.s.GuestGdtr.pGdt
             ||  GDTR.cbGdt != pVM->selm.s.GuestGdtr.cbGdt)
         {
@@ -1072,5 +1047,4 @@
             pVM->selm.s.fGDTRangeRegistered = true;
         }
-#endif
     }
 
@@ -1113,5 +1087,4 @@
             /* ldtr = 0 - update hyper LDTR and deregister any active handler. */
             CPUMSetHyperLDTR(pVCpu, 0);
-#ifdef SELM_TRACK_GUEST_LDT_CHANGES
             if (pVM->selm.s.GCPtrGuestLdt != RTRCPTR_MAX)
             {
@@ -1120,5 +1093,4 @@
                 pVM->selm.s.GCPtrGuestLdt = RTRCPTR_MAX;
             }
-#endif
             STAM_PROFILE_STOP(&pVM->selm.s.StatUpdateFromCPUM, a);
             return VINF_SUCCESS;
@@ -1149,5 +1121,4 @@
              */
             CPUMSetHyperLDTR(pVCpu, 0);
-#ifdef SELM_TRACK_GUEST_LDT_CHANGES
             if (pVM->selm.s.GCPtrGuestLdt != RTRCPTR_MAX)
             {
@@ -1156,5 +1127,4 @@
                 pVM->selm.s.GCPtrGuestLdt = RTRCPTR_MAX;
             }
-#endif
             STAM_PROFILE_STOP(&pVM->selm.s.StatUpdateFromCPUM, a);
             return VINF_SUCCESS;
@@ -1171,5 +1141,4 @@
 
 
-#ifdef SELM_TRACK_GUEST_LDT_CHANGES
         /** @todo Handle only present LDT segments. */
     //    if (pDesc->Gen.u1Present)
@@ -1218,7 +1187,4 @@
             }
         }
-#else
-        pVM->selm.s.cbLdtLimit = cbLdt;
-#endif
 
         /*