Changeset 23191 in vbox for trunk

Timestamp:

Sep 21, 2009 2:22:37 PM (15 years ago)

Author:

vboxsync

Message:

VMM: Hacked EM to quit processing forced actions on VINF_EM_SUSPEND, VINF_EM_RESET and VINF_EM_OFF. When going from the live to the suspended step in VMR3Save/VMR3Migrate it frequently happened that the vmR3LiveDoStep2 VMREQ was processed right after the VMR3EmtRendezvous that suspended the VM. TM gets very upset if this happens.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (5 diffs)
• VMReq.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -1261 +1261 @@
             rc2 = VMMR3EmtRendezvousFF(pVM, pVCpu);
             UPDATE_RC();
+            /** @todo HACK ALERT! The following test is to make sure EM+TM things the VM is
+             * stopped/reset before the next VM state change is made. We need a better
+             * solution for this, or at least make it possible to do: (rc >= VINF_EM_FIRST
+             * && rc >= VINF_EM_SUSPEND). */
+            if (RT_UNLIKELY(rc == VINF_EM_SUSPEND || rc == VINF_EM_RESET || rc == VINF_EM_OFF))
+            {
+                Log2(("emR3ForcedActions: returns %Rrc\n", rc));
+                STAM_REL_PROFILE_STOP(&pVCpu->em.s.StatForcedActions, a);
+                return rc;
+            }
         }
 
@@ -1347 +1357 @@
             rc2 = VMMR3EmtRendezvousFF(pVM, pVCpu);
             UPDATE_RC();
+            /** @todo HACK ALERT! The following test is to make sure EM+TM things the VM is
+             * stopped/reset before the next VM state change is made. We need a better
+             * solution for this, or at least make it possible to do: (rc >= VINF_EM_FIRST
+             * && rc >= VINF_EM_SUSPEND). */
+            if (RT_UNLIKELY(rc == VINF_EM_SUSPEND || rc == VINF_EM_RESET || rc == VINF_EM_OFF))
+            {
+                Log2(("emR3ForcedActions: returns %Rrc\n", rc));
+                STAM_REL_PROFILE_STOP(&pVCpu->em.s.StatForcedActions, a);
+                return rc;
+            }
         }
 
@@ -1362 +1382 @@
             }
             UPDATE_RC();
+            /** @todo HACK ALERT! The following test is to make sure EM+TM things the VM is
+             * stopped/reset before the next VM state change is made. We need a better
+             * solution for this, or at least make it possible to do: (rc >= VINF_EM_FIRST
+             * && rc >= VINF_EM_SUSPEND). */
+            if (RT_UNLIKELY(rc == VINF_EM_SUSPEND || rc == VINF_EM_RESET || rc == VINF_EM_OFF))
+            {
+                Log2(("emR3ForcedActions: returns %Rrc\n", rc));
+                STAM_REL_PROFILE_STOP(&pVCpu->em.s.StatForcedActions, a);
+                return rc;
+            }
         }
 
@@ -1403 +1433 @@
             }
             UPDATE_RC();
+            /** @todo HACK ALERT! The following test is to make sure EM+TM things the VM is
+             * stopped/reset before the next VM state change is made. We need a better
+             * solution for this, or at least make it possible to do: (rc >= VINF_EM_FIRST
+             * && rc >= VINF_EM_SUSPEND). */
+            if (RT_UNLIKELY(rc == VINF_EM_SUSPEND || rc == VINF_EM_RESET || rc == VINF_EM_OFF))
+            {
+                Log2(("emR3ForcedActions: returns %Rrc\n", rc));
+                STAM_REL_PROFILE_STOP(&pVCpu->em.s.StatForcedActions, a);
+                return rc;
+            }
         }
 
@@ -1501 +1541 @@
             rc2 = VMMR3EmtRendezvousFF(pVM, pVCpu);
             UPDATE_RC();
+            /** @todo HACK ALERT! The following test is to make sure EM+TM things the VM is
+             * stopped/reset before the next VM state change is made. We need a better
+             * solution for this, or at least make it possible to do: (rc >= VINF_EM_FIRST
+             * && rc >= VINF_EM_SUSPEND). */
+            if (RT_UNLIKELY(rc == VINF_EM_SUSPEND || rc == VINF_EM_RESET || rc == VINF_EM_OFF))
+            {
+                Log2(("emR3ForcedActions: returns %Rrc\n", rc));
+                STAM_REL_PROFILE_STOP(&pVCpu->em.s.StatForcedActions, a);
+                return rc;
+            }
         }
 

trunk/src/VBox/VMM/VMReq.cpp

@@ -1056 +1056 @@
                      || rc2 < rc) )
                 rc = rc2;
+            /** @todo may have to abort processing to propagate EM scheduling status codes
+             *        up to the caller... See the ugly hacks after VMMR3EmtRendezvousFF
+             *        and VMR3ReqProcessU in EM.cpp. */
         }
     }