Changeset 71032 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 15, 2018 4:57:48 PM (7 years ago)

Author:

vboxsync

Message:

NEM: More code. bugref:9044

File:

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

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

@@ -1710 +1710 @@
 {
     uint8_t u2State = pInfo->u2NemState;
-    int rc = nemR3NativeSetPhysPage(pVM, GCPhys, pInfo->fNemProt, &u2State,
-                                    u2State <= NEM_WIN_PAGE_STATE_UNMAPPED /*fBackingChanged*/);
+    bool    fBackingChanged = true;
+    switch (u2State)
+    {
+        case NEM_WIN_PAGE_STATE_UNMAPPED:
+        case NEM_WIN_PAGE_STATE_NOT_SET:
+            if (pInfo->fNemProt == NEM_PAGE_PROT_NONE)
+                return VINF_SUCCESS;
+            break;
+        case NEM_WIN_PAGE_STATE_READABLE:
+            if (pInfo->fNemProt != NEM_PAGE_PROT_NONE)
+            {
+                if (!(pInfo->fNemProt & NEM_PAGE_PROT_WRITE))
+                    return VINF_SUCCESS;
+                fBackingChanged = false;
+            }
+            break;
+        case NEM_WIN_PAGE_STATE_WRITABLE:
+            if (pInfo->fNemProt & NEM_PAGE_PROT_WRITE)
+                return VINF_SUCCESS;
+            if (pInfo->fNemProt != NEM_PAGE_PROT_NONE)
+                fBackingChanged = false;
+            break;
+    }
+
+    int rc = nemR3NativeSetPhysPage(pVM, GCPhys & ~(RTGCPHYS)X86_PAGE_OFFSET_MASK, pInfo->fNemProt, &u2State, fBackingChanged);
     pInfo->u2NemState = u2State;
     RT_NOREF(pVCpu, pvUser);
@@ -1727 +1750 @@
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   pCtx            The CPU context to update.
- * @param   pExitReason     The exit reason information.
+ * @param   pMemCtx         The exit reason information.
  */
 static VBOXSTRICTRC nemR3WinHandleMemoryAccess(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, WHV_MEMORY_ACCESS_CONTEXT const *pMemCtx)
@@ -1766 +1789 @@
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   pCtx            The CPU context to update.
- * @param   pExitReason     The exit reason information.
+ * @param   pIoPortCtx      The exit reason information.
  */
 static VBOXSTRICTRC nemR3WinHandleIoPortAccess(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx,