Changeset 9023 in vbox for trunk/src/VBox

Timestamp:

May 21, 2008 2:48:23 PM (17 years ago)

Author:

vboxsync

Message:

Fixed some runtime assertions

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (3 diffs)
• PGMAllShw.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -215 +215 @@
 #undef PGM_SHW_TYPE
 #undef PGM_SHW_NAME
+#endif
 
 /*
@@ -271 +272 @@
 #undef PGM_GST_NAME
 
+#ifndef IN_GC /* AMD64 implies VT-x/AMD-V */
 /* Guest - AMD64 mode */
 #define PGM_GST_TYPE                PGM_TYPE_AMD64
@@ -286 +288 @@
 #undef PGM_SHW_TYPE
 #undef PGM_SHW_NAME
-
 #endif
-
 
 /**

trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

@@ -112 +112 @@
 PGM_SHW_DECL(int, GetPage)(PVM pVM, RTGCUINTPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys)
 {
+#if PGM_SHW_TYPE == PGM_TYPE_NESTED
+    return VERR_PAGE_TABLE_NOT_PRESENT;
+#else
     /*
      * Get the PDE.
@@ -215 +218 @@
 
     return VINF_SUCCESS;
+#endif /* PGM_SHW_TYPE == PGM_TYPE_NESTED */
 }
 
@@ -234 +238 @@
 PGM_SHW_DECL(int, ModifyPage)(PVM pVM, RTGCUINTPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
 {
+#if PGM_SHW_TYPE == PGM_TYPE_NESTED
+    return VERR_PAGE_TABLE_NOT_PRESENT;
+#else
     int rc;
 
@@ -308 +315 @@
         }
     }
+#endif /* PGM_SHW_TYPE == PGM_TYPE_NESTED */
 }