Index: trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp	(revision 91014)
+++ trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp	(revision 91015)
@@ -97,17 +97,4 @@
 #endif
 
-
-/** @def GVMM_CHECK_SMAP_SETUP
- * SMAP check setup. */
-/** @def GVMM_CHECK_SMAP_CHECK
- * Checks that the AC flag is set if SMAP is enabled. If AC is not set,
- * it will be logged and @a a_BadExpr is executed. */
-/** @def GVMM_CHECK_SMAP_CHECK2
- * Checks that the AC flag is set if SMAP is enabled.  If AC is not set, it will
- * be logged, written to the VMs assertion text buffer, and @a a_BadExpr is
- * executed. */
-#define GVMM_CHECK_SMAP_SETUP()           uint32_t const fKernelFeatures = 0
-#define GVMM_CHECK_SMAP_CHECK(a_BadExpr)           NOREF(fKernelFeatures)
-#define GVMM_CHECK_SMAP_CHECK2(a_pGVM, a_BadExpr)   NOREF(fKernelFeatures)
 
 /** Special value that GVMMR0DeregisterVCpu sets. */
@@ -2145,7 +2132,4 @@
     LogFlow(("GVMMR0SchedHalt: pGVM=%p pGVCpu=%p(%d) u64ExpireGipTime=%#RX64\n",
              pGVM, pGVCpu, pGVCpu->idCpu, u64ExpireGipTime));
-    GVMM_CHECK_SMAP_SETUP();
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-
     PGVMM pGVMM;
     GVMM_GET_VALID_INSTANCE(pGVMM, VERR_GVMM_INSTANCE);
@@ -2163,5 +2147,4 @@
     {
         int rc2 = GVMMR0_USED_SHARED_LOCK(pGVMM); AssertRC(rc2);
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     }
 
@@ -2174,11 +2157,7 @@
     const uint64_t u64NowSys = RTTimeSystemNanoTS();
     const uint64_t u64NowGip = RTTimeNanoTS();
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 
     if (fDoEarlyWakeUps)
-    {
         pGVM->gvmm.s.StatsSched.cHaltWakeUps += gvmmR0SchedDoWakeUps(pGVMM, u64NowGip);
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-    }
 
     /*
@@ -2204,10 +2183,8 @@
             GVMMR0_USED_SHARED_UNLOCK(pGVMM);
         }
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 
         rc = RTSemEventMultiWaitEx(pGVCpu->gvmm.s.HaltEventMulti,
                                    RTSEMWAIT_FLAGS_ABSOLUTE | RTSEMWAIT_FLAGS_NANOSECS | RTSEMWAIT_FLAGS_INTERRUPTIBLE,
                                    u64NowGip > u64NowSys ? u64ExpireGipTime : u64NowSys + cNsInterval);
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 
         ASMAtomicWriteU64(&pGVCpu->gvmm.s.u64HaltExpire, 0);
@@ -2216,8 +2193,5 @@
         /* Reset the semaphore to try prevent a few false wake-ups. */
         if (rc == VINF_SUCCESS)
-        {
             RTSemEventMultiReset(pGVCpu->gvmm.s.HaltEventMulti);
-            GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-        }
         else if (rc == VERR_TIMEOUT)
         {
@@ -2231,7 +2205,5 @@
         if (fDoEarlyWakeUps)
             GVMMR0_USED_SHARED_UNLOCK(pGVMM);
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
         RTSemEventMultiReset(pGVCpu->gvmm.s.HaltEventMulti);
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
         rc = VINF_SUCCESS;
     }
@@ -2253,14 +2225,8 @@
 GVMMR0DECL(int) GVMMR0SchedHaltReq(PGVM pGVM, VMCPUID idCpu, uint64_t u64ExpireGipTime)
 {
-    GVMM_CHECK_SMAP_SETUP();
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     PGVMM pGVMM;
     int rc = gvmmR0ByGVMandEMT(pGVM, idCpu, &pGVMM);
     if (RT_SUCCESS(rc))
-    {
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
         rc = GVMMR0SchedHalt(pGVM, &pGVM->aCpus[idCpu], u64ExpireGipTime);
-    }
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     return rc;
 }
@@ -2324,7 +2290,4 @@
 GVMMR0DECL(int) GVMMR0SchedWakeUpEx(PGVM pGVM, VMCPUID idCpu, bool fTakeUsedLock)
 {
-    GVMM_CHECK_SMAP_SETUP();
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-
     /*
      * Validate input and take the UsedLock.
@@ -2332,5 +2295,4 @@
     PGVMM pGVMM;
     int rc = gvmmR0ByGVM(pGVM, &pGVMM, fTakeUsedLock);
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     if (RT_SUCCESS(rc))
     {
@@ -2341,5 +2303,4 @@
              */
             rc = gvmmR0SchedWakeUpOne(pGVM, &pGVM->aCpus[idCpu]);
-            GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 
             if (fTakeUsedLock && pGVMM->fDoEarlyWakeUps)
@@ -2351,5 +2312,4 @@
                 const uint64_t u64Now = RTTimeNanoTS(); /* (GIP time) */
                 pGVM->gvmm.s.StatsSched.cWakeUpWakeUps += gvmmR0SchedDoWakeUps(pGVMM, u64Now);
-                GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             }
         }
@@ -2361,5 +2321,4 @@
             int rc2 = GVMMR0_USED_SHARED_UNLOCK(pGVMM);
             AssertRC(rc2);
-            GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
         }
     }
@@ -2402,9 +2361,6 @@
 GVMMR0DECL(int) GVMMR0SchedWakeUpNoGVMNoLock(PGVM pGVM, VMCPUID idCpu)
 {
-    GVMM_CHECK_SMAP_SETUP();
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     PGVMM pGVMM;
     int rc = gvmmR0ByGVM(pGVM, &pGVMM, false /*fTakeUsedLock*/);
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     if (RT_SUCCESS(rc))
         rc = GVMMR0SchedWakeUpEx(pGVM, idCpu, false /*fTakeUsedLock*/);
@@ -2536,6 +2492,4 @@
     AssertPtrReturn(pSleepSet, VERR_INVALID_POINTER);
     AssertPtrReturn(pPokeSet, VERR_INVALID_POINTER);
-    GVMM_CHECK_SMAP_SETUP();
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     RTNATIVETHREAD hSelf = RTThreadNativeSelf();
 
@@ -2545,5 +2499,4 @@
     PGVMM pGVMM;
     int rc = gvmmR0ByGVM(pGVM, &pGVMM, true /* fTakeUsedLock */);
-    GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     if (RT_SUCCESS(rc))
     {
@@ -2558,18 +2511,11 @@
             /* just ignore errors for now. */
             if (VMCPUSET_IS_PRESENT(pSleepSet, idCpu))
-            {
                 gvmmR0SchedWakeUpOne(pGVM, &pGVM->aCpus[idCpu]);
-                GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-            }
             else if (VMCPUSET_IS_PRESENT(pPokeSet, idCpu))
-            {
                 gvmmR0SchedPokeOne(pGVM, &pGVM->aCpus[idCpu]);
-                GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-            }
         }
 
         int rc2 = GVMMR0_USED_SHARED_UNLOCK(pGVMM);
         AssertRC(rc2);
-        GVMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     }
 
Index: trunk/src/VBox/VMM/VMMR0/VMMR0.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 91014)
+++ trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 91015)
@@ -79,22 +79,4 @@
 
 
-
-/*********************************************************************************************************************************
-*   Defined Constants And Macros                                                                                                 *
-*********************************************************************************************************************************/
-/** @def VMM_CHECK_SMAP_SETUP
- * SMAP check setup. */
-/** @def VMM_CHECK_SMAP_CHECK
- * Checks that the AC flag is set if SMAP is enabled. If AC is not set,
- * it will be logged and @a a_BadExpr is executed. */
-/** @def VMM_CHECK_SMAP_CHECK2
- * Checks that the AC flag is set if SMAP is enabled.  If AC is not set, it will
- * be logged, written to the VMs assertion text buffer, and @a a_BadExpr is
- * executed. */
-#define VMM_CHECK_SMAP_SETUP()                          uint32_t const fKernelFeatures = 0
-#define VMM_CHECK_SMAP_CHECK(a_BadExpr)                 NOREF(fKernelFeatures)
-#define VMM_CHECK_SMAP_CHECK2(a_pGVM, a_BadExpr)        NOREF(fKernelFeatures)
-
-
 /*********************************************************************************************************************************
 *   Internal Functions                                                                                                           *
@@ -145,7 +127,4 @@
 DECLEXPORT(int) ModuleInit(void *hMod)
 {
-    VMM_CHECK_SMAP_SETUP();
-    VMM_CHECK_SMAP_CHECK(RT_NOTHING);
-
 #ifdef VBOX_WITH_DTRACE_R0
     /*
@@ -175,25 +154,18 @@
     if (RT_SUCCESS(rc))
     {
-        VMM_CHECK_SMAP_CHECK(RT_NOTHING);
         rc = GVMMR0Init();
         if (RT_SUCCESS(rc))
         {
-            VMM_CHECK_SMAP_CHECK(RT_NOTHING);
             rc = GMMR0Init();
             if (RT_SUCCESS(rc))
             {
-                VMM_CHECK_SMAP_CHECK(RT_NOTHING);
                 rc = HMR0Init();
                 if (RT_SUCCESS(rc))
                 {
-                    VMM_CHECK_SMAP_CHECK(RT_NOTHING);
-
                     PDMR0Init(hMod);
-                    VMM_CHECK_SMAP_CHECK(RT_NOTHING);
 
                     rc = PGMRegisterStringFormatTypes();
                     if (RT_SUCCESS(rc))
                     {
-                        VMM_CHECK_SMAP_CHECK(RT_NOTHING);
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
                         rc = PGMR0DynMapInit();
@@ -201,25 +173,20 @@
                         if (RT_SUCCESS(rc))
                         {
-                            VMM_CHECK_SMAP_CHECK(RT_NOTHING);
                             rc = IntNetR0Init();
                             if (RT_SUCCESS(rc))
                             {
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-                                VMM_CHECK_SMAP_CHECK(RT_NOTHING);
                                 rc = PciRawR0Init();
 #endif
                                 if (RT_SUCCESS(rc))
                                 {
-                                    VMM_CHECK_SMAP_CHECK(RT_NOTHING);
                                     rc = CPUMR0ModuleInit();
                                     if (RT_SUCCESS(rc))
                                     {
 #ifdef VBOX_WITH_TRIPLE_FAULT_HACK
-                                        VMM_CHECK_SMAP_CHECK(RT_NOTHING);
                                         rc = vmmR0TripleFaultHackInit();
                                         if (RT_SUCCESS(rc))
 #endif
                                         {
-                                            VMM_CHECK_SMAP_CHECK(rc = VERR_VMM_SMAP_BUT_AC_CLEAR);
                                             if (RT_SUCCESS(rc))
                                             {
@@ -387,7 +354,4 @@
 static int vmmR0InitVM(PGVM pGVM, uint32_t uSvnRev, uint32_t uBuildType)
 {
-    VMM_CHECK_SMAP_SETUP();
-    VMM_CHECK_SMAP_CHECK(return VERR_VMM_SMAP_BUT_AC_CLEAR);
-
     /*
      * Match the SVN revisions and build type.
@@ -472,5 +436,4 @@
      * Initialize the per VM data for GVMM and GMM.
      */
-    VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
     rc = GVMMR0InitVM(pGVM);
     if (RT_SUCCESS(rc))
@@ -479,8 +442,5 @@
          * Init HM, CPUM and PGM (Darwin only).
          */
-        VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
         rc = HMR0InitVM(pGVM);
-        if (RT_SUCCESS(rc))
-            VMM_CHECK_SMAP_CHECK2(pGVM, rc = VERR_VMM_RING0_ASSERTION); /* CPUR0InitVM will otherwise panic the host */
         if (RT_SUCCESS(rc))
         {
@@ -488,13 +448,10 @@
             if (RT_SUCCESS(rc))
             {
-                VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
                 rc = PGMR0InitVM(pGVM);
                 if (RT_SUCCESS(rc))
                 {
-                    VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
                     rc = EMR0InitVM(pGVM);
                     if (RT_SUCCESS(rc))
                     {
-                        VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
                         rc = PciRawR0InitVM(pGVM);
@@ -502,25 +459,18 @@
                         if (RT_SUCCESS(rc))
                         {
-                            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
                             rc = GIMR0InitVM(pGVM);
                             if (RT_SUCCESS(rc))
                             {
-                                VMM_CHECK_SMAP_CHECK2(pGVM, rc = VERR_VMM_RING0_ASSERTION);
-                                if (RT_SUCCESS(rc))
-                                {
-                                    GVMMR0DoneInitVM(pGVM);
-
-                                    /*
-                                     * Collect a bit of info for the VM release log.
-                                     */
-                                    pGVM->vmm.s.fIsPreemptPendingApiTrusty = RTThreadPreemptIsPendingTrusty();
-                                    pGVM->vmm.s.fIsPreemptPossible         = RTThreadPreemptIsPossible();;
-
-                                    VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-                                    return rc;
-                                }
+                                GVMMR0DoneInitVM(pGVM);
+
+                                /*
+                                 * Collect a bit of info for the VM release log.
+                                 */
+                                pGVM->vmm.s.fIsPreemptPendingApiTrusty = RTThreadPreemptIsPendingTrusty();
+                                pGVM->vmm.s.fIsPreemptPossible         = RTThreadPreemptIsPossible();;
+                                return rc;
 
                                 /* bail out*/
-                                GIMR0TermVM(pGVM);
+                                //GIMR0TermVM(pGVM);
                             }
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
@@ -1432,10 +1382,4 @@
 
     /*
-     * SMAP fun.
-     */
-    VMM_CHECK_SMAP_SETUP();
-    VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
-
-    /*
      * Perform requested operation.
      */
@@ -1481,5 +1425,4 @@
                     if (pGVM->vmm.s.fUsePeriodicPreemptionTimers)
                         GVMMR0SchedUpdatePeriodicPreemptionTimer(pGVM, pGVCpu->idHostCpu, TMCalcHostTimerFrequency(pGVM, pGVCpu));
-                    VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 
 #ifdef VMM_R0_TOUCH_FPU
@@ -1527,7 +1470,5 @@
                              * Setup the longjmp machinery and execute guest code (calls HMR0RunGuestCode).
                              */
-                            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
                             rc = vmmR0CallRing3SetJmp(&pGVCpu->vmm.s.CallRing3JmpBufR0, HMR0RunGuestCode, pGVM, pGVCpu);
-                            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 
                             /*
@@ -1657,5 +1598,4 @@
              * Setup the longjmp machinery and execute guest code (calls NEMR0RunGuestCode).
              */
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 #  ifdef VBOXSTRICTRC_STRICT_ENABLED
             int rc = vmmR0CallRing3SetJmp2(&pGVCpu->vmm.s.CallRing3JmpBufR0, (PFNVMMR0SETJMP2)NEMR0RunGuestCode, pGVM, idCpu);
@@ -1663,5 +1603,4 @@
             int rc = vmmR0CallRing3SetJmp2(&pGVCpu->vmm.s.CallRing3JmpBufR0, NEMR0RunGuestCode, pGVM, idCpu);
 #  endif
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             STAM_COUNTER_INC(&pGVM->vmm.s.StatRunGC);
 
@@ -1695,5 +1634,4 @@
             break;
     }
-    VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
 }
 
@@ -1783,10 +1721,4 @@
 
     /*
-     * SMAP fun.
-     */
-    VMM_CHECK_SMAP_SETUP();
-    VMM_CHECK_SMAP_CHECK(RT_NOTHING);
-
-    /*
      * Process the request.
      */
@@ -1802,5 +1734,4 @@
             else
                 rc = VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK(RT_NOTHING);
             break;
 
@@ -1810,5 +1741,4 @@
             else
                 rc = VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK(RT_NOTHING);
             break;
 
@@ -1818,5 +1748,4 @@
             else
                 rc = VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1826,5 +1755,4 @@
             else
                 rc = VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1832,7 +1760,5 @@
             if (pReqHdr)
                 return VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             rc = GVMMR0SchedHaltReq(pGVM, idCpu, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1840,7 +1766,5 @@
             if (pReqHdr || u64Arg)
                 return VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             rc = GVMMR0SchedWakeUp(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1849,5 +1773,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GVMMR0SchedPoke(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1856,5 +1779,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GVMMR0SchedWakeUpAndPokeCpusReq(pGVM, (PGVMMSCHEDWAKEUPANDPOKECPUSREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1863,5 +1785,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GVMMR0SchedPoll(pGVM, idCpu, !!u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1870,5 +1791,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GVMMR0QueryStatisticsReq(pGVM, (PGVMMQUERYSTATISTICSSREQ)pReqHdr, pSession);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1877,5 +1797,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GVMMR0ResetStatisticsReq(pGVM, (PGVMMRESETSTATISTICSSREQ)pReqHdr, pSession);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1885,5 +1804,4 @@
         case VMMR0_DO_VMMR0_INIT:
             rc = vmmR0InitVM(pGVM, RT_LODWORD(u64Arg), RT_HIDWORD(u64Arg));
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1893,5 +1811,4 @@
         case VMMR0_DO_VMMR0_INIT_EMT:
             rc = vmmR0InitVMEmt(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1901,5 +1818,4 @@
         case VMMR0_DO_VMMR0_TERM:
             rc = VMMR0TermVM(pGVM, 0 /*idCpu*/);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1914,5 +1830,4 @@
             else
                 return VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1927,5 +1842,4 @@
             else
                 return VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1940,5 +1854,4 @@
             else
                 return VERR_INVALID_PARAMETER;
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1948,5 +1861,4 @@
         case VMMR0_DO_HM_ENABLE:
             rc = HMR0EnableAllCpus(pGVM);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1956,5 +1868,4 @@
         case VMMR0_DO_HM_SETUP_VM:
             rc = HMR0SetupVM(pGVM);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1966,5 +1877,4 @@
                 return VERR_INVALID_CPU_ID;
             rc = PGMR0PhysAllocateHandyPages(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1973,5 +1883,4 @@
                 return VERR_INVALID_CPU_ID;
             rc = PGMR0PhysFlushHandyPages(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1980,5 +1889,4 @@
                 return VERR_INVALID_CPU_ID;
             rc = PGMR0PhysAllocateLargeHandyPage(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1987,5 +1895,4 @@
                 return VERR_INVALID_CPU_ID;
             rc = PGMR0PhysSetupIoMmu(pGVM);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -1994,5 +1901,4 @@
                 return VERR_INVALID_CPU_ID;
             rc = PGMR0PoolGrow(pGVM);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2004,5 +1910,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0InitialReservationReq(pGVM, idCpu, (PGMMINITIALRESERVATIONREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2011,5 +1916,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0UpdateReservationReq(pGVM, idCpu, (PGMMUPDATERESERVATIONREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2018,5 +1922,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0AllocatePagesReq(pGVM, idCpu, (PGMMALLOCATEPAGESREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2025,5 +1928,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0FreePagesReq(pGVM, idCpu, (PGMMFREEPAGESREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2032,5 +1934,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0FreeLargePageReq(pGVM, idCpu, (PGMMFREELARGEPAGEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2039,5 +1940,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0QueryHypervisorMemoryStatsReq((PGMMMEMSTATSREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2048,5 +1948,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0QueryMemoryStatsReq(pGVM, idCpu, (PGMMMEMSTATSREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2055,5 +1954,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0BalloonedPagesReq(pGVM, idCpu, (PGMMBALLOONEDPAGESREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2062,5 +1960,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0MapUnmapChunkReq(pGVM, (PGMMMAPUNMAPCHUNKREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2069,5 +1966,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0SeedChunk(pGVM, idCpu, (RTR3PTR)u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2078,5 +1974,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0RegisterSharedModuleReq(pGVM, idCpu, (PGMMREGISTERSHAREDMODULEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2087,5 +1982,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0UnregisterSharedModuleReq(pGVM, idCpu, (PGMMUNREGISTERSHAREDMODULEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2097,5 +1991,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0ResetSharedModules(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2109,5 +2002,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0CheckSharedModules(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2119,5 +2011,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0FindDuplicatePageReq(pGVM, (PGMMFINDDUPLICATEPAGEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 #endif
@@ -2127,5 +2018,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0QueryStatisticsReq(pGVM, (PGMMQUERYSTATISTICSSREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2134,5 +2024,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = GMMR0ResetStatisticsReq(pGVM, (PGMMRESETSTATISTICSSREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2161,5 +2050,4 @@
                 //    rc = GMMR0QueryConfig(pReq->pSession, &pReq->szName[0], &pReq->u64Value);
             }
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2173,5 +2061,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = PDMR0DriverCallReqHandler(pGVM, (PPDMDRIVERCALLREQHANDLERREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2182,5 +2069,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = PDMR0DeviceCreateReqHandler(pGVM, (PPDMDEVICECREATEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2191,5 +2077,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = PDMR0DeviceGenCallReqHandler(pGVM, (PPDMDEVICEGENCALLREQ)pReqHdr, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2201,5 +2086,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = PDMR0DeviceCompatSetCritSectReqHandler(pGVM, (PPDMDEVICECOMPATSETCRITSECTREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2214,5 +2098,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0OpenReq(pSession, pReq);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2222,5 +2105,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfCloseReq(pSession, (PINTNETIFCLOSEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2230,5 +2112,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfGetBufferPtrsReq(pSession, (PINTNETIFGETBUFFERPTRSREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2237,5 +2118,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfSetPromiscuousModeReq(pSession, (PINTNETIFSETPROMISCUOUSMODEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2244,5 +2124,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfSetMacAddressReq(pSession, (PINTNETIFSETMACADDRESSREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2251,5 +2130,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfSetActiveReq(pSession, (PINTNETIFSETACTIVEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2258,5 +2136,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfSendReq(pSession, (PINTNETIFSENDREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2265,5 +2142,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfWaitReq(pSession, (PINTNETIFWAITREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2272,5 +2148,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IntNetR0IfAbortWaitReq(pSession, (PINTNETIFABORTWAITREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2283,5 +2158,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = PciRawR0ProcessReq(pGVM, pSession, (PPCIRAWSENDREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 #endif
@@ -2296,5 +2170,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0InitVM(pGVM);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2303,5 +2176,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0InitVMPart2(pGVM);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2310,5 +2182,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0MapPages(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2317,5 +2188,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0UnmapPages(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2324,5 +2194,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0ExportState(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2331,5 +2200,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0ImportState(pGVM, idCpu, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2338,5 +2206,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0QueryCpuTick(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2345,5 +2212,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0ResumeCpuTickOnAll(pGVM, idCpu, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2352,5 +2218,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0UpdateStatistics(pGVM, idCpu);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 
@@ -2360,5 +2225,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = NEMR0DoExperiment(pGVM, idCpu, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
 #   endif
@@ -2374,5 +2238,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IOMR0IoPortGrowRegistrationTables(pGVM, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2383,5 +2246,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IOMR0IoPortGrowStatisticsTable(pGVM, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2392,5 +2254,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IOMR0MmioGrowRegistrationTables(pGVM, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2401,5 +2262,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = IOMR0MmioGrowStatisticsTable(pGVM, u64Arg);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2412,5 +2272,4 @@
             if (RT_SUCCESS(rc))
                 rc = IOMR0MmioSyncStatisticsIndices(pGVM);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2425,5 +2284,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = DBGFR0TracerCreateReqHandler(pGVM, (PDBGFTRACERCREATEREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2438,5 +2296,4 @@
             rc = VERR_NOT_IMPLEMENTED;
 # endif
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2448,5 +2305,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = DBGFR0BpInitReqHandler(pGVM, (PDBGFBPINITREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2457,5 +2313,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = DBGFR0BpChunkAllocReqHandler(pGVM, (PDBGFBPCHUNKALLOCREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2466,5 +2321,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = DBGFR0BpL2TblChunkAllocReqHandler(pGVM, (PDBGFBPL2TBLCHUNKALLOCREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2475,5 +2329,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = DBGFR0BpOwnerInitReqHandler(pGVM, (PDBGFBPOWNERINITREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2484,5 +2337,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = DBGFR0BpPortIoInitReqHandler(pGVM, (PDBGFBPINITREQ)pReqHdr);
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
@@ -2497,5 +2349,4 @@
                 return VERR_INVALID_PARAMETER;
             rc = TMR0TimerQueueGrow(pGVM, RT_HI_U32(u64Arg), RT_LO_U32(u64Arg));
-            VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
         }
