Changeset 71035 in vbox for trunk

Timestamp:

Feb 15, 2018 8:51:04 PM (7 years ago)

Author:

vboxsync

Message:

NEM: More code - got the 'FATAL: Could not read from the boot medium! System halted.' message up on the screen. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1696 +1696 @@
 
 
-static VBOXSTRICTRC nemR3WinHandleHalt(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, WHV_RUN_VP_EXIT_CONTEXT const *pExitReason)
-{
-    NOREF(pVM); NOREF(pVCpu); NOREF(pCtx); NOREF(pExitReason);
-    AssertLogRelFailedReturn(VERR_NOT_IMPLEMENTED);
+static VBOXSTRICTRC nemR3WinHandleHalt(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    NOREF(pVM); NOREF(pVCpu); NOREF(pCtx);
+    LogFlow(("nemR3WinHandleHalt\n"));
+    return VINF_EM_HALT;
 }
 
@@ -1794 +1795 @@
                                                WHV_X64_IO_PORT_ACCESS_CONTEXT const *pIoPortCtx)
 {
+    Assert(   pIoPortCtx->AccessInfo.AccessSize == 1
+           || pIoPortCtx->AccessInfo.AccessSize == 2
+           || pIoPortCtx->AccessInfo.AccessSize == 4);
+
     VBOXSTRICTRC rcStrict;
     if (!pIoPortCtx->AccessInfo.StringOp)
@@ -1803 +1808 @@
 
         static uint32_t const s_fAndMask[8] =
-        {   UINT32_C(0xff), UINT32_C(0xffff), UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX };
+        { UINT32_MAX, UINT32_C(0xff), UINT32_C(0xffff), UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX, UINT32_MAX };
         uint32_t const fAndMask = s_fAndMask[pIoPortCtx->AccessInfo.AccessSize];
         if (pIoPortCtx->AccessInfo.IsWrite)
@@ -2018 +2023 @@
 
             case WHvRunVpExitReasonX64Halt:
-                rcStrict = nemR3WinHandleHalt(pVM, pVCpu, pCtx, &ExitReason);
+                rcStrict = nemR3WinHandleHalt(pVM, pVCpu, pCtx);
                 break;
 
@@ -2076 +2081 @@
             || VMCPU_FF_IS_PENDING(pVCpu, !fSingleStepping ? VMCPU_FF_HP_R0_PRE_HM_MASK : VMCPU_FF_HP_R0_PRE_HM_STEP_MASK) )
         {
-            LogFlow(("nemR3NativeRunGC: returning: pending FF\n"));
+            LogFlow(("nemR3NativeRunGC: returning: pending FF (%#x / %#x)\n", pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions));
             break;
         }