Changeset 72272 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 21, 2018 12:48:49 PM (7 years ago)

Author:

vboxsync

Message:

NEMAll: Oops, forgot to drop && defined(IN_RING3) after doing the ring-0 impl. This caused page replacements and assignments made in ring-0 to be ignored, with the usual consequences (guest confusion). bugref:9044

File:

• trunk/src/VBox/VMM/VMMAll/NEMAll.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAll.cpp

@@ -39 +39 @@
 VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb)
 {
-#if defined(VBOX_WITH_NATIVE_NEM) && defined(IN_RING3)
+#ifdef VBOX_WITH_NATIVE_NEM
     if (VM_IS_NEM_ENABLED(pVM))
         nemHCNativeNotifyHandlerPhysicalRegister(pVM, enmKind, GCPhys, cb);
@@ -51 +51 @@
                                                         int fRestoreAsRAM, bool fRestoreAsRAM2)
 {
-#if defined(VBOX_WITH_NATIVE_NEM) && defined(IN_RING3)
+#ifdef VBOX_WITH_NATIVE_NEM
     if (VM_IS_NEM_ENABLED(pVM))
         nemHCNativeNotifyHandlerPhysicalDeregister(pVM, enmKind, GCPhys, cb, fRestoreAsRAM, fRestoreAsRAM2);
@@ -63 +63 @@
                                                     RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fRestoreAsRAM)
 {
-#if defined(VBOX_WITH_NATIVE_NEM) && defined(IN_RING3)
+#ifdef VBOX_WITH_NATIVE_NEM
     if (VM_IS_NEM_ENABLED(pVM))
         nemHCNativeNotifyHandlerPhysicalModify(pVM, enmKind, GCPhysOld, GCPhysNew, cb, fRestoreAsRAM);
@@ -76 +76 @@
 {
     Assert(VM_IS_NEM_ENABLED(pVM));
-#if defined(VBOX_WITH_NATIVE_NEM) && defined(IN_RING3)
+#ifdef VBOX_WITH_NATIVE_NEM
     return nemHCNativeNotifyPhysPageAllocated(pVM, GCPhys, HCPhys, fPageProt, enmType, pu2State);
 #else
@@ -89 +89 @@
 {
     Assert(VM_IS_NEM_ENABLED(pVM));
-#if defined(VBOX_WITH_NATIVE_NEM)
+#ifdef VBOX_WITH_NATIVE_NEM
     nemHCNativeNotifyPhysPageProtChanged(pVM, GCPhys, HCPhys, fPageProt, enmType, pu2State);
 #else
@@ -101 +101 @@
 {
     Assert(VM_IS_NEM_ENABLED(pVM));
-#if defined(VBOX_WITH_NATIVE_NEM)
+#ifdef VBOX_WITH_NATIVE_NEM
     nemHCNativeNotifyPhysPageChanged(pVM, GCPhys, HCPhysPrev, HCPhysNew, fPageProt, enmType, pu2State);
 #else