Index: trunk/src/VBox/VMM/VMMR0/VMMR0.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 43392)
+++ trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 43394)
@@ -744,5 +744,5 @@
          * we hope to get away with page faults and later calling into the kernel.
          */
-        case VMMR0_DO_HWACC_RUN:
+        case VMMR0_DO_HM_RUN:
         {
 #ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
@@ -964,5 +964,5 @@
          * Attempt to enable hm mode and check the current setting.
          */
-        case VMMR0_DO_HWACC_ENABLE:
+        case VMMR0_DO_HM_ENABLE:
             return HMR0EnableAllCpus(pVM);
 
@@ -970,5 +970,5 @@
          * Setup the hardware accelerated session.
          */
-        case VMMR0_DO_HWACC_SETUP_VM:
+        case VMMR0_DO_HM_SETUP_VM:
             return HMR0SetupVM(pVM);
 
Index: trunk/src/VBox/VMM/VMMR3/EM.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/EM.cpp	(revision 43392)
+++ trunk/src/VBox/VMM/VMMR3/EM.cpp	(revision 43394)
@@ -635,5 +635,5 @@
      */
     return    pVCpu->em.s.enmState == EMSTATE_RAW
-           || pVCpu->em.s.enmState == EMSTATE_HWACC
+           || pVCpu->em.s.enmState == EMSTATE_HM
            || pVCpu->em.s.enmState == EMSTATE_REM
          ? VINF_EM_RESCHEDULE
@@ -696,5 +696,5 @@
         case EMSTATE_NONE:              return "EMSTATE_NONE";
         case EMSTATE_RAW:               return "EMSTATE_RAW";
-        case EMSTATE_HWACC:             return "EMSTATE_HWACC";
+        case EMSTATE_HM:             return "EMSTATE_HM";
         case EMSTATE_REM:               return "EMSTATE_REM";
         case EMSTATE_HALTED:            return "EMSTATE_HALTED";
@@ -1197,5 +1197,5 @@
         if (   EMIsHwVirtExecutionEnabled(pVM)
             && HMR3CanExecuteGuest(pVM, pCtx))
-            return EMSTATE_HWACC;
+            return EMSTATE_HM;
 
         /*
@@ -1686,5 +1686,5 @@
         if (    !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY)
             &&  !VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
-            &&  (!rc || rc >= VINF_EM_RESCHEDULE_HWACC)
+            &&  (!rc || rc >= VINF_EM_RESCHEDULE_HM)
             &&  !TRPMHasTrap(pVCpu) /* an interrupt could already be scheduled for dispatching in the recompiler. */
             &&  PATMAreInterruptsEnabled(pVM)
@@ -1931,5 +1931,5 @@
                 VBOXVMM_EM_FF_ALL_RET(pVCpu, rc);
                 if (   (   rc == VINF_EM_RESCHEDULE_REM
-                        || rc == VINF_EM_RESCHEDULE_HWACC)
+                        || rc == VINF_EM_RESCHEDULE_HM)
                     && pVCpu->em.s.fForceRAW)
                     rc = VINF_EM_RESCHEDULE_RAW;
@@ -1962,8 +1962,8 @@
                  * Reschedule - to hardware accelerated raw-mode execution.
                  */
-                case VINF_EM_RESCHEDULE_HWACC:
-                    Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_HWACC: %d -> %d (EMSTATE_HWACC)\n", enmOldState, EMSTATE_HWACC));
+                case VINF_EM_RESCHEDULE_HM:
+                    Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_HM: %d -> %d (EMSTATE_HM)\n", enmOldState, EMSTATE_HM));
                     Assert(!pVCpu->em.s.fForceRAW);
-                    pVCpu->em.s.enmState = EMSTATE_HWACC;
+                    pVCpu->em.s.enmState = EMSTATE_HM;
                     break;
 
@@ -2163,8 +2163,8 @@
                     && (pVCpu->em.s.MWait.fWait & EMMWAIT_FLAG_ACTIVE)
                     && (   enmNewState == EMSTATE_RAW
-                        || enmNewState == EMSTATE_HWACC
+                        || enmNewState == EMSTATE_HM
                         || enmNewState == EMSTATE_REM
                         || enmNewState == EMSTATE_DEBUG_GUEST_RAW
-                        || enmNewState == EMSTATE_DEBUG_GUEST_HWACC
+                        || enmNewState == EMSTATE_DEBUG_GUEST_HM
                         || enmNewState == EMSTATE_DEBUG_GUEST_REM) )
                 {
@@ -2196,5 +2196,5 @@
                  * Execute hardware accelerated raw.
                  */
-                case EMSTATE_HWACC:
+                case EMSTATE_HM:
 #ifndef IEM_VERIFICATION_MODE /* remove later */
                     rc = emR3HmExecute(pVM, pVCpu, &fFFDone);
Index: trunk/src/VBox/VMM/VMMR3/EMHM.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/EMHM.cpp	(revision 43392)
+++ trunk/src/VBox/VMM/VMMR3/EMHM.cpp	(revision 43394)
@@ -81,5 +81,5 @@
 static int emR3HmStep(PVM pVM, PVMCPU pVCpu)
 {
-    Assert(pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC);
+    Assert(pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HM);
 
     int         rc;
@@ -132,5 +132,5 @@
     int     rc          = VINF_SUCCESS;
     EMSTATE enmOldState = pVCpu->em.s.enmState;
-    pVCpu->em.s.enmState  = EMSTATE_DEBUG_GUEST_HWACC;
+    pVCpu->em.s.enmState  = EMSTATE_DEBUG_GUEST_HM;
 
     Log(("Single step BEGIN:\n"));
@@ -217,5 +217,5 @@
             {
 #ifdef EM_NOTIFY_HM
-                if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC)
+                if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HM)
                     HMR3NotifyEmulated(pVCpu);
 #endif
@@ -247,5 +247,5 @@
 
 #ifdef EM_NOTIFY_HM
-    if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC)
+    if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HM)
         HMR3NotifyEmulated(pVCpu);
 #endif
@@ -584,5 +584,5 @@
             VBOXVMM_EM_FF_ALL_RET(pVCpu, rc);
             if (    rc != VINF_SUCCESS
-                &&  rc != VINF_EM_RESCHEDULE_HWACC)
+                &&  rc != VINF_EM_RESCHEDULE_HM)
             {
                 *pfFFDone = true;
Index: trunk/src/VBox/VMM/VMMR3/HM.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/HM.cpp	(revision 43392)
+++ trunk/src/VBox/VMM/VMMR3/HM.cpp	(revision 43394)
@@ -774,8 +774,8 @@
 
     /* Enable VT-x or AMD-V on all host CPUs. */
-    rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HWACC_ENABLE, 0, NULL);
+    rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HM_ENABLE, 0, NULL);
     if (RT_FAILURE(rc))
     {
-        LogRel(("HMR3InitFinalize: SUPR3CallVMMR0Ex VMMR0_DO_HWACC_ENABLE failed with %Rrc\n", rc));
+        LogRel(("HMR3InitFinalize: SUPR3CallVMMR0Ex VMMR0_DO_HM_ENABLE failed with %Rrc\n", rc));
         return rc;
     }
@@ -1187,5 +1187,5 @@
             }
 
-            rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HWACC_SETUP_VM, 0, NULL);
+            rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HM_SETUP_VM, 0, NULL);
             AssertRC(rc);
             if (rc == VINF_SUCCESS)
@@ -1386,5 +1386,5 @@
                 pVM->hm.s.fNestedPaging = pVM->hm.s.fAllowNestedPaging;
 
-            rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HWACC_SETUP_VM, 0, NULL);
+            rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HM_SETUP_VM, 0, NULL);
             AssertRC(rc);
             if (rc == VINF_SUCCESS)
Index: trunk/src/VBox/VMM/VMMR3/TRPM.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/TRPM.cpp	(revision 43392)
+++ trunk/src/VBox/VMM/VMMR3/TRPM.cpp	(revision 43394)
@@ -1529,5 +1529,5 @@
                 AssertRC(rc);
                 STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
-                return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HWACC : VINF_EM_RESCHEDULE_REM;
+                return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM;
             }
             /* If the guest gate is not patched, then we will check (again) if we can patch it. */
@@ -1564,5 +1564,5 @@
         {
             AssertRC(rc);
-            return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HWACC : VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
+            return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
         }
 #else
@@ -1577,5 +1577,5 @@
                 AssertRC(rc);
                 STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
-                return VINF_EM_RESCHEDULE_HWACC;
+                return VINF_EM_RESCHEDULE_HM;
             }
         }
Index: trunk/src/VBox/VMM/VMMR3/VMM.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/VMM.cpp	(revision 43392)
+++ trunk/src/VBox/VMM/VMMR3/VMM.cpp	(revision 43394)
@@ -1283,5 +1283,5 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            rc = SUPR3CallVMMR0Fast(pVM->pVMR0, VMMR0_DO_HWACC_RUN, pVCpu->idCpu);
+            rc = SUPR3CallVMMR0Fast(pVM->pVMR0, VMMR0_DO_HM_RUN, pVCpu->idCpu);
             if (RT_LIKELY(rc == VINF_SUCCESS))
                 rc = pVCpu->vmm.s.iLastGZRc;
Index: trunk/src/VBox/VMM/VMMR3/VMMTests.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/VMMTests.cpp	(revision 43392)
+++ trunk/src/VBox/VMM/VMMR3/VMMTests.cpp	(revision 43394)
@@ -559,5 +559,5 @@
 
             uint64_t TickThisStart = ASMReadTSC();
-            rc = SUPR3CallVMMR0Fast(pVM->pVMR0, VMMR0_DO_HWACC_RUN, 0);
+            rc = SUPR3CallVMMR0Fast(pVM->pVMR0, VMMR0_DO_HM_RUN, 0);
             uint64_t TickThisElapsed = ASMReadTSC() - TickThisStart;
             if (RT_FAILURE(rc))
Index: trunk/src/VBox/VMM/include/EMHandleRCTmpl.h
===================================================================
--- trunk/src/VBox/VMM/include/EMHandleRCTmpl.h	(revision 43392)
+++ trunk/src/VBox/VMM/include/EMHandleRCTmpl.h	(revision 43394)
@@ -47,5 +47,5 @@
             break;
         case VINF_EM_RESCHEDULE_RAW:
-        case VINF_EM_RESCHEDULE_HWACC:
+        case VINF_EM_RESCHEDULE_HM:
         case VINF_EM_RAW_INTERRUPT:
         case VINF_EM_RAW_TO_R3:
