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

Timestamp:

May 21, 2008 3:59:09 PM (17 years ago)

Author:

vboxsync

Message:

Mode switch fixes for nested paging.

File:

• trunk/src/VBox/VMM/PGM.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -2626 +2626 @@
 static void pgmR3ModeDataSwitch(PVM pVM, PGMMODE enmShw, PGMMODE enmGst)
 {
-    PPGMMODEDATA pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(enmShw, enmGst)];
+    PPGMMODEDATA pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndexByMode(enmShw, enmGst)];
 
     Assert(pModeData->uGstType == pgmModeToType(enmGst));
@@ -2981 +2981 @@
                 rc = PGM_SHW_NAME_AMD64(Enter)(pVM);
                 break;
+            case PGMMODE_NESTED:
+                rc = PGM_SHW_NAME_NESTED(Enter)(pVM);
+                break;
             case PGMMODE_REAL:
             case PGMMODE_PROTECTED:
@@ -3015 +3018 @@
                     rc2 = PGM_BTH_NAME_PAE_REAL(Enter)(pVM, NIL_RTGCPHYS);
                     break;
+                case PGMMODE_NESTED:
+                    rc2 = PGM_BTH_NAME_NESTED_REAL(Enter)(pVM, NIL_RTGCPHYS);
+                    break;
                 case PGMMODE_AMD64:
                 case PGMMODE_AMD64_NX:
@@ -3033 +3039 @@
                     rc2 = PGM_BTH_NAME_PAE_PROT(Enter)(pVM, NIL_RTGCPHYS);
                     break;
+                case PGMMODE_NESTED:
+                    rc2 = PGM_BTH_NAME_NESTED_PROT(Enter)(pVM, NIL_RTGCPHYS);
+                    break;
                 case PGMMODE_AMD64:
                 case PGMMODE_AMD64_NX:
@@ -3051 +3060 @@
                 case PGMMODE_PAE_NX:
                     rc2 = PGM_BTH_NAME_PAE_32BIT(Enter)(pVM, GCPhysCR3);
+                    break;
+                case PGMMODE_NESTED:
+                    rc2 = PGM_BTH_NAME_NESTED_32BIT(Enter)(pVM, GCPhysCR3);
                     break;
                 case PGMMODE_AMD64:
@@ -3084 +3096 @@
                     rc2 = PGM_BTH_NAME_PAE_PAE(Enter)(pVM, GCPhysCR3);
                     break;
+                case PGMMODE_NESTED:
+                    rc2 = PGM_BTH_NAME_NESTED_PAE(Enter)(pVM, GCPhysCR3);
+                    break;
                 case PGMMODE_32_BIT:
                 case PGMMODE_AMD64:
@@ -3102 +3117 @@
                 case PGMMODE_AMD64_NX:
                     rc2 = PGM_BTH_NAME_AMD64_AMD64(Enter)(pVM, GCPhysCR3);
+                    break;
+                case PGMMODE_NESTED:
+                    rc2 = PGM_BTH_NAME_NESTED_AMD64(Enter)(pVM, GCPhysCR3);
                     break;
                 case PGMMODE_32_BIT: