Changeset 1982 in vbox for trunk

Timestamp:

Apr 7, 2007 10:13:35 AM (18 years ago)

Author:

vboxsync

Message:

Removed obsolete code.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (5 diffs)
• EMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -373 +373 @@
 static DECLCALLBACK(int) emR3Save(PVM pVM, PSSMHANDLE pSSM)
 {
-    SSMR3PutBool(pSSM, pVM->em.s.fRawModeUsed);
-    SSMR3PutBool(pSSM, pVM->em.s.fHwAccModeUsed);
     return SSMR3PutBool(pSSM, pVM->em.s.fForceRAW);
 }
@@ -401 +399 @@
      * Load the saved state.
      */
-    int rc = SSMR3GetBool(pSSM, &pVM->em.s.fRawModeUsed);
-    if (VBOX_FAILURE(rc))
-        pVM->em.s.fRawModeUsed = false;
-
-    rc = SSMR3GetBool(pSSM, &pVM->em.s.fHwAccModeUsed);
-    if (VBOX_FAILURE(rc))
-        pVM->em.s.fHwAccModeUsed = false;
-
-    rc = SSMR3GetBool(pSSM, &pVM->em.s.fForceRAW);
+    int rc = SSMR3GetBool(pSSM, &pVM->em.s.fForceRAW);
     if (VBOX_FAILURE(rc))
         pVM->em.s.fForceRAW = false;
@@ -2448 +2438 @@
 EMR3DECL(int) EMR3CheckRawForcedActions(PVM pVM)
 {
-    int rc = VINF_SUCCESS;
-
-    /* Too early if we haven't entered raw or hw accelerated mode yet */
-    /** @todo fix this properly */
-    if (    pVM->em.s.fHwAccModeUsed 
-        ||  pVM->em.s.fRawModeUsed)
-    {
-        rc = emR3RawForcedActions(pVM, pVM->em.s.pCtx);
-    }
-
-    return rc;
+    return emR3RawForcedActions(pVM, pVM->em.s.pCtx);
 }
 
@@ -2658 +2638 @@
         LogFlow(("RR0-E: %08X ESP=%08X IF=%d VMFlags=%x PIF=%d CPL=%d\n", pCtx->eip, pCtx->esp, pCtx->eflags.Bits.u1IF, pGCState->uVMFlags, pGCState->fPIF, (pCtx->ss & X86_SEL_RPL)));
         LogFlow(("VMMR3RawRunGC returned %Vrc\n", rc));
-
-        /* Signal that we've used raw mode for the first time */
-        pVM->em.s.fRawModeUsed = true;
 
         /*
@@ -2871 +2848 @@
         VMMR3Lock(pVM);
         STAM_PROFILE_STOP(&pVM->em.s.StatHwAccExec, x);
-
-        /* Signal that we've used hardware accelerated mode for the first time */
-        pVM->em.s.fHwAccModeUsed = true;
 
         /*

trunk/src/VBox/VMM/EMInternal.h

@@ -42 +42 @@
 
 /** The saved state version. */
-#define EM_SAVED_STATE_VERSION  3
+#define EM_SAVED_STATE_VERSION                      2
 
 /** Enable for tracing in raw mode.
@@ -238 +238 @@
     bool                    fForceRAW;
 
-    /* Set when raw mode was used for the first time */
-    bool                    fRawModeUsed;
-    /* Set when hardware accelerated mode was used for the first time */
-    bool                    fHwAccModeUsed;
-
 #ifdef DEBUG_TRACING_ENABLED
     /** @see DEBUG_TRACING_ENABLED */