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

Timestamp:

Oct 12, 2018 10:20:59 AM (7 years ago)

Author:

vboxsync

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

125730

Message:

vm.h,VMM: Made VMCPU_FF_CLEAR work on a single flag, introducing VMCPU_FF_CLEAR_MASK for the two cases we clear more than one. bugref:9180

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EMR3Nem.cpp (modified) (1 diff)
• VM.cpp (modified) (1 diff)

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

@@ -310 +310 @@
     {
         Log(("NEM: TODO: Make VMCPU_FF_PGM_SYNC_CR3 / VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL quiet! (%#x)\n", pVCpu->fLocalForcedActions));
-        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL);
+        VMCPU_FF_CLEAR_MASK(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL);
     }
 

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

@@ -2873 +2873 @@
 
     /* Clear all pending forced actions. */
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_ALL_MASK & ~VMCPU_FF_REQUEST);
+    VMCPU_FF_CLEAR_MASK(pVCpu, VMCPU_FF_ALL_MASK & ~VMCPU_FF_REQUEST);
 
     /*