Changeset 3172 in vbox

Timestamp:

Jun 20, 2007 9:14:10 AM (17 years ago)

Author:

vboxsync

Message:

compile fix

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (2 diffs)
• HWVMXR0.cpp (modified) (2 diffs)

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

@@ -1304 +1304 @@
             break;
         }
-        /* Force instruction emulation and not a reschedule to the recompiler as that will come right back to us */
-        if (rc == VINF_EM_RESCHEDULE_REM)
-            rc = VINF_IOM_HC_IOPORT_READWRITE;
-
 #ifdef VBOX_STRICT
         if (rc == VINF_IOM_HC_IOPORT_READ)
@@ -1316 +1312 @@
             AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("%Vrc\n", rc));
 #endif 
+        /* Force instruction emulation and not a reschedule to the recompiler as that will come right back to us */
+        if (rc == VINF_EM_RESCHEDULE_REM)
+            rc = VINF_IOM_HC_IOPORT_WRITE;
         Log2(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
         break;

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

@@ -1742 +1742 @@
             break;
         }
-        /* Force instruction emulation and not a reschedule to the recompiler as that will come right back to us */
-        if (rc == VINF_EM_RESCHEDULE_REM)
-            rc = VINF_IOM_HC_IOPORT_READWRITE;
-
 #ifdef VBOX_STRICT
         if (rc == VINF_IOM_HC_IOPORT_READ)
@@ -1754 +1750 @@
             AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("%Vrc\n", rc));
 #endif
+        /* Force instruction emulation and not a reschedule to the recompiler as that will come right back to us */
+        if (rc == VINF_EM_RESCHEDULE_REM)
+            rc = VINF_IOM_HC_IOPORT_WRITE;
         break;
     }