Changeset 55436 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 27, 2015 9:13:02 AM (10 years ago)

Author:

vboxsync

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

99782

Message:

Reverted bad commit r99781.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -1116 +1116 @@
 
 #ifdef LOG_ENABLED
-    SUPR0Printf("hmR0PowerCallback %s\n", RTPowerGetEventName(enmEvent));
+    if (enmEvent == RTPOWEREVENT_SUSPEND)
+        SUPR0Printf("hmR0PowerCallback RTPOWEREVENT_SUSPEND\n");
+    else
+        SUPR0Printf("hmR0PowerCallback RTPOWEREVENT_RESUME\n");
 #endif
 
@@ -1138 +1141 @@
             /* else nothing to do here for the local init case */
         }
-        else if (enmEvent == RTPOWEREVENT_RESUME)
+        else
         {
             /* Reinit the CPUs from scratch as the suspend state might have

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

@@ -458 +458 @@
     VMCPU_ASSERT_EMT(pVCpu);
     Assert(pVCpu->vmm.s.hR0ThreadCtx == NIL_RTTHREADCTX);
-#if 0 /* defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) */
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
     int rc = RTThreadCtxHooksCreate(&pVCpu->vmm.s.hR0ThreadCtx);
     if (   RT_FAILURE(rc)