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

Timestamp:

May 22, 2018 2:28:10 PM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Fixes to code using WHv API.

File:

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

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

@@ -1499 +1499 @@
     if (fExitCtx)
     {
-        const WHV_VP_EXIT_CONTEXT *pVpCtx = &pExitReason->IoPortAccess.VpContext;
+        const WHV_VP_EXIT_CONTEXT *pVpCtx = &pExitReason->VpContext;
         Log2(("Exit: + CS:RIP=%04x:%08RX64 RFLAGS=%06RX64 cbInstr=%u CS={%RX64 L %#RX32, %#x}\n",
               pVpCtx->Cs.Selector,
@@ -1601 +1601 @@
  * @param   pCtx            The CPU context to update.
  * @param   pMemCtx         The exit reason information.
- */
-static VBOXSTRICTRC nemR3WinWHvHandleMemoryAccess(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, WHV_MEMORY_ACCESS_CONTEXT const *pMemCtx)
+ * @param   pVpContext      The processor context info associated with the exit.
+ */
+static VBOXSTRICTRC nemR3WinWHvHandleMemoryAccess(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, WHV_MEMORY_ACCESS_CONTEXT const *pMemCtx,
+                                                  WHV_VP_EXIT_CONTEXT const *pVpContext)
 {
     /*
@@ -1642 +1644 @@
     VBOXSTRICTRC rcStrict;
     if (pMemCtx->InstructionByteCount > 0)
-        rcStrict = IEMExecOneWithPrefetchedByPC(pVCpu, CPUMCTX2CORE(pCtx), pMemCtx->VpContext.Rip,
+        rcStrict = IEMExecOneWithPrefetchedByPC(pVCpu, CPUMCTX2CORE(pCtx), pVpContext->Rip,
                                                 &pMemCtx->InstructionBytes[0], pMemCtx->InstructionByteCount);
     else
@@ -1662 +1664 @@
  * @param   pIoPortCtx      The exit reason information.
  */
-static VBOXSTRICTRC nemR3WinWHvHandleIoPortAccess(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx,
-                                                  WHV_X64_IO_PORT_ACCESS_CONTEXT const *pIoPortCtx)
+static VBOXSTRICTRC
+nemR3WinWHvHandleIoPortAccess(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, WHV_X64_IO_PORT_ACCESS_CONTEXT const *pIoPortCtx,
+                              WHV_VP_EXIT_CONTEXT const *pVpContext)
 {
     Assert(   pIoPortCtx->AccessInfo.AccessSize == 1
@@ -1685 +1688 @@
                                       pIoPortCtx->AccessInfo.AccessSize);
             if (IOM_SUCCESS(rcStrict))
-                nemR3WinAdvanceGuestRipAndClearRF(pVCpu, pCtx, &pIoPortCtx->VpContext);
+                nemR3WinAdvanceGuestRipAndClearRF(pVCpu, pCtx, pVpContext);
         }
         else
@@ -1695 +1698 @@
             {
                 pCtx->eax = (pCtx->eax & ~fAndMask) | (uValue & fAndMask);
-                nemR3WinAdvanceGuestRipAndClearRF(pVCpu, pCtx, &pIoPortCtx->VpContext);
+                nemR3WinAdvanceGuestRipAndClearRF(pVCpu, pCtx, pVpContext);
             }
         }
@@ -1733 +1736 @@
          * Do debug checks.
          */
-        if (   pIoPortCtx->VpContext.ExecutionState.DebugActive /** @todo Microsoft: Does DebugActive this only reflext DR7? */
-            || (pIoPortCtx->VpContext.Rflags & X86_EFL_TF)
+        if (   pVpContext->ExecutionState.DebugActive /** @todo Microsoft: Does DebugActive this only reflext DR7? */
+            || (pVpContext->Rflags & X86_EFL_TF)
             || DBGFBpIsHwIoArmed(pVM) )
         {
@@ -1898 +1901 @@
             /* Frequent exits: */
             case WHvRunVpExitReasonCanceled:
-            case WHvRunVpExitReasonAlerted:
+            //case WHvRunVpExitReasonAlerted:
                 rcStrict = VINF_SUCCESS;
                 break;
@@ -1907 +1910 @@
 
             case WHvRunVpExitReasonMemoryAccess:
-                rcStrict = nemR3WinWHvHandleMemoryAccess(pVM, pVCpu, pCtx, &ExitReason.MemoryAccess);
+                rcStrict = nemR3WinWHvHandleMemoryAccess(pVM, pVCpu, pCtx, &ExitReason.MemoryAccess, &ExitReason.VpContext);
                 break;
 
             case WHvRunVpExitReasonX64IoPortAccess:
-                rcStrict = nemR3WinWHvHandleIoPortAccess(pVM, pVCpu, pCtx, &ExitReason.IoPortAccess);
+                rcStrict = nemR3WinWHvHandleIoPortAccess(pVM, pVCpu, pCtx, &ExitReason.IoPortAccess, &ExitReason.VpContext);
                 break;