Changeset 56062 in vbox

Timestamp:

May 25, 2015 3:46:04 PM (10 years ago)

Author:

vboxsync

Message:

PGMAllPhys.cpp: Fixed a couple of typos - IEM not IOM is OK with access handler returns, return the right serious status code in PGMPhysRead/Write.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (10 diffs)

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

@@ -141 +141 @@
     NOREF(pVM); NOREF(pVCpu); NOREF(GCPhys); NOREF(pvPhys); NOREF(pvBuf); NOREF(cbBuf);
     NOREF(enmAccessType); NOREF(enmOrigin); NOREF(pvUser);
-AssertFailed(); /// dont commit me!!!
     return VINF_EM_RAW_EMULATE_INSTR;
 }
@@ -2304 +2303 @@
         Assert((pPhys->Core.KeyLast & PAGE_OFFSET_MASK) == PAGE_OFFSET_MASK);
 #ifndef IN_RING3
-        if (enmOrigin != PGMACCESSORIGIN_IOM)
+        if (enmOrigin != PGMACCESSORIGIN_IEM)
         {
             /* Cannot reliably handle informational status codes in this context */
@@ -2354 +2353 @@
 
 # ifndef IN_RING3
-        if (enmOrigin != PGMACCESSORIGIN_IOM)
+        if (enmOrigin != PGMACCESSORIGIN_IEM)
         {
             /* Cannot reliably handle informational status codes in this context */
@@ -2513 +2512 @@
                     {
                         pgmUnlock(pVM);
-                        return rcStrict;
+                        return rcStrict2;
                     }
                 }
@@ -2597 +2596 @@
             Assert(GCPhys >= pCur->Core.Key && GCPhys <= pCur->Core.KeyLast);
 #ifndef IN_RING3
-            if (enmOrigin != PGMACCESSORIGIN_IOM)
+            if (enmOrigin != PGMACCESSORIGIN_IEM)
                 /* Cannot reliably handle informational status codes in this context */
                 return VERR_PGM_PHYS_WR_HIT_HANDLER;
@@ -2674 +2673 @@
         {
 # ifndef IN_RING3
-            if (enmOrigin != PGMACCESSORIGIN_IOM)
+            if (enmOrigin != PGMACCESSORIGIN_IEM)
                 /* Cannot reliably handle informational status codes in this context */
                 return VERR_PGM_PHYS_WR_HIT_HANDLER;
@@ -2848 +2847 @@
         {
 #ifndef IN_RING3
-            if (enmOrigin != PGMACCESSORIGIN_IOM)
+            if (enmOrigin != PGMACCESSORIGIN_IEM)
                 /* Cannot reliably handle informational status codes in this context */
                 return VERR_PGM_PHYS_WR_HIT_HANDLER;
@@ -2887 +2886 @@
         {
 # ifndef IN_RING3
-            if (enmOrigin != PGMACCESSORIGIN_IOM)
+            if (enmOrigin != PGMACCESSORIGIN_IEM)
                 /* Cannot reliably handle informational status codes in this context */
                 return VERR_PGM_PHYS_WR_HIT_HANDLER;
@@ -2917 +2916 @@
         {
 # ifndef IN_RING3
-            if (enmOrigin != PGMACCESSORIGIN_IOM)
+            if (enmOrigin != PGMACCESSORIGIN_IEM)
                 /* Cannot reliably handle informational status codes in this context */
                 return VERR_PGM_PHYS_WR_HIT_HANDLER;
@@ -3136 +3135 @@
                     {
                         pgmUnlock(pVM);
-                        return rcStrict;
+                        return rcStrict2;
                     }
                 }