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

Timestamp:

Oct 22, 2021 1:20:39 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147814

Message:

VMM/PGM: Always check VM_IS_NEM_ENABLED before calling into NEM. bugref:10122

File:

• trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -1759 +1759 @@
      * Notify NEM now that it has been linked.
      */
-    int rc = NEMR3NotifyPhysRamRegister(pVM, GCPhys, pNew->cb, pNew->pvR3);
-    if (RT_FAILURE(rc))
-        pgmR3PhysUnlinkRamRange2(pVM, pNew, pPrev);
-    return rc;
-#else
+    if (VM_IS_NEM_ENABLED(pVM))
+    {
+        int rc = NEMR3NotifyPhysRamRegister(pVM, GCPhys, pNew->cb, pNew->pvR3);
+        if (RT_FAILURE(rc))
+            pgmR3PhysUnlinkRamRange2(pVM, pNew, pPrev);
+        return rc;
+    }
+#endif
     return VINF_SUCCESS;
-#endif
 }
 
@@ -4377 +4379 @@
                          * Notify NEM again.
                          */
-                        u2NemState = UINT8_MAX;
-                        rc = NEMR3NotifyPhysRomRegisterLate(pVM, GCPhys, cb, PGM_RAMRANGE_CALC_PAGE_R3PTR(pRamNew, GCPhys),
-                                                            fNemNotify, &u2NemState);
-                        if (u2NemState != UINT8_MAX)
-                            pgmPhysSetNemStateForPages(&pRamNew->aPages[idxFirstRamPage], cPages, u2NemState);
-                        if (RT_SUCCESS(rc))
+                        if (VM_IS_NEM_ENABLED(pVM))
+                        {
+                            u2NemState = UINT8_MAX;
+                            rc = NEMR3NotifyPhysRomRegisterLate(pVM, GCPhys, cb, PGM_RAMRANGE_CALC_PAGE_R3PTR(pRamNew, GCPhys),
+                                                                fNemNotify, &u2NemState);
+                            if (u2NemState != UINT8_MAX)
+                                pgmPhysSetNemStateForPages(&pRamNew->aPages[idxFirstRamPage], cPages, u2NemState);
+                            if (RT_SUCCESS(rc))
+                                return rc;
+                        }
+                        else
 #endif
                             return rc;
@@ -4825 +4832 @@
         pVCpu->pgm.s.fA20Enabled = fEnable;
         pVCpu->pgm.s.GCPhysA20Mask = ~((RTGCPHYS)!fEnable << 20);
-        NEMR3NotifySetA20(pVCpu, fEnable);
+        if (VM_IS_NEM_ENABLED(pVCpu->CTX_SUFF(pVM)))
+            NEMR3NotifySetA20(pVCpu, fEnable);
 #ifdef PGM_WITH_A20
         VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3);