Changeset 13517 in vbox

Timestamp:

Oct 23, 2008 8:33:55 AM (16 years ago)

Author:

vboxsync

Message:

Refined suspend state testing.

Location:

trunk

Files:

• include/VBox/hwaccm.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/hwaccm.h

@@ -120 +120 @@
  * @{
  */
-VMMR0DECL(int)  HWACCMR0SetupVM(PVM pVM);
-VMMR0DECL(int)  HWACCMR0RunGuestCode(PVM pVM);
-VMMR0DECL(int)  HWACCMR0Enter(PVM pVM);
-VMMR0DECL(int)  HWACCMR0Leave(PVM pVM);
-VMMR0DECL(int)  HWACCMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt);
-VMMR0DECL(int)  HWACCMR0FlushTLB(PVM pVM);
+VMMR0DECL(int)   HWACCMR0SetupVM(PVM pVM);
+VMMR0DECL(int)   HWACCMR0RunGuestCode(PVM pVM);
+VMMR0DECL(int)   HWACCMR0Enter(PVM pVM);
+VMMR0DECL(int)   HWACCMR0Leave(PVM pVM);
+VMMR0DECL(int)   HWACCMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt);
+VMMR0DECL(int)   HWACCMR0FlushTLB(PVM pVM);
+VMMR0DECL(bool)  HWACCMR0SuspendPending();
 /** @} */
 #endif /* IN_RING0 */

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

@@ -800 +800 @@
 
     /* Make sure we don't touch hwaccm after we've disabled hwaccm in preparation of a suspend. */
-    if (HWACCMR0Globals.fSuspended)
-        return VERR_HWACCM_SUSPEND_PENDING;
+    AssertReturn(!HWACCMR0Globals.fSuspended, VERR_HWACCM_SUSPEND_PENDING);
 
     /* Terminate a VT-x or AMD-V VM. */
@@ -819 +818 @@
 
     /* Make sure we don't touch hwaccm after we've disabled hwaccm in preparation of a suspend. */
-    if (HWACCMR0Globals.fSuspended)
-        return VERR_HWACCM_SUSPEND_PENDING;
+    AssertReturn(!HWACCMR0Globals.fSuspended, VERR_HWACCM_SUSPEND_PENDING);
 
 #ifdef LOG_ENABLED
@@ -844 +842 @@
 
     /* Make sure we can't enter a session after we've disabled hwaccm in preparation of a suspend. */
-    if (HWACCMR0Globals.fSuspended)
-        return VINF_EM_RAW_INTERRUPT;
+    AssertReturn(!HWACCMR0Globals.fSuspended, VERR_HWACCM_SUSPEND_PENDING);
 
     rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
@@ -949 +946 @@
 
     return HWACCMR0Globals.pfnRunGuestCode(pVM, pCtx);
+}
+
+/**
+ * Returns suspend status of the host
+ *
+ * @returns Suspend pending or not
+ */
+VMMR0DECL(bool) HWACCMR0SuspendPending()
+{
+    return HWACCMR0Globals.fSuspended;
 }
 

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

@@ -618 +618 @@
          * Disable interrupts before we do anything interesting. On Windows we avoid
          * this by having the support driver raise the IRQL before calling us, this way
-         * we hope to get away we page faults and later calling into the kernel.
+         * we hope to get away with page faults and later calling into the kernel.
          */
         case VMMR0_DO_HWACC_RUN:
         {
+            int rc;
+
             STAM_COUNTER_INC(&pVM->vmm.s.StatRunGC);
 
@@ -627 +629 @@
             RTCCUINTREG uFlags = ASMIntDisableFlags();
 #endif
-            int rc = HWACCMR0Enter(pVM);
-            if (VBOX_SUCCESS(rc))
+            if (!HWACCMR0SuspendPending())
             {
-                rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM); /* this may resume code. */
-                int rc2 = HWACCMR0Leave(pVM);
-                AssertRC(rc2);
+                rc = HWACCMR0Enter(pVM);
+                if (VBOX_SUCCESS(rc))
+                {
+                    rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM); /* this may resume code. */
+                    int rc2 = HWACCMR0Leave(pVM);
+                    AssertRC(rc2);
+                }
+            }
+            else
+            {
+                /* System is about to go into suspend mode; go back to ring 3. */
+                rc = VINF_EM_RAW_INTERRUPT;
             }
             pVM->vmm.s.iLastGCRc = rc;