Changeset 10683 in vbox for trunk/src/VBox

Timestamp:

Jul 16, 2008 7:45:39 AM (16 years ago)

Author:

vboxsync

Message:

Backed out 33399; must save the host context on entry due to long jumps to ring 3.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWACCMR0.cpp (modified) (5 diffs)
• HWSVMR0.cpp (modified) (1 diff)

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

@@ -65 +65 @@
     DECLR0CALLBACKMEMBER(int, pfnEnterSession,(PVM pVM, PHWACCM_CPUINFO pCpu));
     DECLR0CALLBACKMEMBER(int, pfnLeaveSession,(PVM pVM));
+    DECLR0CALLBACKMEMBER(int, pfnSaveHostState,(PVM pVM));
     DECLR0CALLBACKMEMBER(int, pfnLoadGuestState,(PVM pVM, CPUMCTX *pCtx));
     DECLR0CALLBACKMEMBER(int, pfnRunGuestCode,(PVM pVM, CPUMCTX *pCtx));
@@ -145 +146 @@
     HWACCMR0Globals.pfnEnterSession     = HWACCMR0DummyEnter;
     HWACCMR0Globals.pfnLeaveSession     = HWACCMR0DummyLeave;
+    HWACCMR0Globals.pfnSaveHostState    = HWACCMR0DummySaveHostState;
     HWACCMR0Globals.pfnLoadGuestState   = HWACCMR0DummyLoadGuestState;
     HWACCMR0Globals.pfnRunGuestCode     = HWACCMR0DummyRunGuestCode;
@@ -341 +343 @@
         HWACCMR0Globals.pfnEnterSession     = VMXR0Enter;
         HWACCMR0Globals.pfnLeaveSession     = VMXR0Leave;
+        HWACCMR0Globals.pfnSaveHostState    = VMXR0SaveHostState;
         HWACCMR0Globals.pfnLoadGuestState   = VMXR0LoadGuestState;
         HWACCMR0Globals.pfnRunGuestCode     = VMXR0RunGuestCode;
@@ -354 +357 @@
         HWACCMR0Globals.pfnEnterSession     = SVMR0Enter;
         HWACCMR0Globals.pfnLeaveSession     = SVMR0Leave;
+        HWACCMR0Globals.pfnSaveHostState    = SVMR0SaveHostState;
         HWACCMR0Globals.pfnLoadGuestState   = SVMR0LoadGuestState;
         HWACCMR0Globals.pfnRunGuestCode     = SVMR0RunGuestCode;
@@ -738 +742 @@
 
     rc  = HWACCMR0Globals.pfnEnterSession(pVM, &HWACCMR0Globals.aCpuInfo[idCpu]);
+    AssertRC(rc);
+    /* We must save the host context here (VT-x) as we might be rescheduled on a different cpu after a long jump back to ring 3. */
+    rc |= HWACCMR0Globals.pfnSaveHostState(pVM);
     AssertRC(rc);
     rc |= HWACCMR0Globals.pfnLoadGuestState(pVM, pCtx);

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

@@ -508 +508 @@
 
 /**
+ * Save the host state
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMR0DECL(int) SVMR0SaveHostState(PVM pVM)
+{
+    /* Nothing to do here. */
+    return VINF_SUCCESS;
+}
+
+/**
  * Loads the guest state
  *