Changeset 80281 in vbox for trunk/src/VBox/VMM/VMMR3/GMM.cpp

Timestamp:

Aug 15, 2019 7:29:37 AM (6 years ago)

Author:

vboxsync

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

132736

Message:

VMM,++: Refactoring code to use VMMC & VMMCPUCC. bugref:9217

File:

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

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

@@ -24 +24 @@
 #include <VBox/vmm/gmm.h>
 #include <VBox/vmm/vmm.h>
-#include <VBox/vmm/vm.h>
+#include <VBox/vmm/vmcc.h>
 #include <VBox/sup.h>
 #include <VBox/err.h>
@@ -309 +309 @@
 
     /* Must be callable from any thread, so can't use VMMR3CallR0. */
-    int rc = SUPR3CallVMMR0Ex(pVM->pVMR0, NIL_VMCPUID, VMMR0_DO_GMM_QUERY_HYPERVISOR_MEM_STATS, 0, &Req.Hdr);
+    int rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), NIL_VMCPUID, VMMR0_DO_GMM_QUERY_HYPERVISOR_MEM_STATS, 0, &Req.Hdr);
     if (rc == VINF_SUCCESS)
     {
@@ -444 +444 @@
 
     /* Must be callable from any thread, so can't use VMMR3CallR0. */
-    int rc = SUPR3CallVMMR0Ex(pVM->pVMR0, NIL_VMCPUID, VMMR0_DO_GMM_FIND_DUPLICATE_PAGE, 0, &Req.Hdr);
+    int rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), NIL_VMCPUID, VMMR0_DO_GMM_FIND_DUPLICATE_PAGE, 0, &Req.Hdr);
     if (rc == VINF_SUCCESS)
         return Req.fDuplicate;