Changeset 80239 in vbox for trunk/src/VBox/VMM/VMMAll/NEMAll.cpp

Timestamp:

Aug 12, 2019 10:57:57 PM (6 years ago)

Author:

vboxsync

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

132689

Message:

VMM: Introducing PVMCC and PGVMCC for VMMAll code. bugref:9217

File:

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

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

@@ -23 +23 @@
 #include <VBox/vmm/nem.h>
 #include "NEMInternal.h"
-#include <VBox/vmm/vm.h>
+#include <VBox/vmm/vmcc.h>
 #include <VBox/err.h>
 
@@ -36 +36 @@
  * @sa      VMR3IsLongModeAllowed, HMIsLongModeAllowed
  */
-VMM_INT_DECL(bool) NEMHCIsLongModeAllowed(PVM pVM)
+VMM_INT_DECL(bool) NEMHCIsLongModeAllowed(PVMCC pVM)
 {
     return pVM->nem.s.fAllow64BitGuests && VM_IS_NEM_ENABLED(pVM);
@@ -52 +52 @@
  * @note    Called while holding down the PGM lock.
  */
-VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb)
+VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalRegister(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb)
 {
 #ifdef VBOX_WITH_NATIVE_NEM
@@ -63 +63 @@
 
 
-VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb,
+VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalDeregister(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb,
                                                         int fRestoreAsRAM, bool fRestoreAsRAM2)
 {
@@ -75 +75 @@
 
 
-VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhysOld,
+VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalModify(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhysOld,
                                                     RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fRestoreAsRAM)
 {
@@ -87 +87 @@
 
 
-VMM_INT_DECL(int)  NEMHCNotifyPhysPageAllocated(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
+VMM_INT_DECL(int)  NEMHCNotifyPhysPageAllocated(PVMCC pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
                                                 PGMPAGETYPE enmType, uint8_t *pu2State)
 {
@@ -100 +100 @@
 
 
-VMM_INT_DECL(void) NEMHCNotifyPhysPageProtChanged(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
+VMM_INT_DECL(void) NEMHCNotifyPhysPageProtChanged(PVMCC pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
                                                   PGMPAGETYPE enmType, uint8_t *pu2State)
 {
@@ -112 +112 @@
 
 
-VMM_INT_DECL(void) NEMHCNotifyPhysPageChanged(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhysPrev, RTHCPHYS HCPhysNew,
+VMM_INT_DECL(void) NEMHCNotifyPhysPageChanged(PVMCC pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhysPrev, RTHCPHYS HCPhysNew,
                                               uint32_t fPageProt, PGMPAGETYPE enmType, uint8_t *pu2State)
 {
@@ -125 +125 @@
 
 #ifndef VBOX_WITH_NATIVE_NEM
-VMM_INT_DECL(int) NEMImportStateOnDemand(PVMCPU pVCpu, uint64_t fWhat)
+VMM_INT_DECL(int) NEMImportStateOnDemand(PVMCPUCC pVCpu, uint64_t fWhat)
 {
     RT_NOREF(pVCpu, fWhat);
@@ -134 +134 @@
 
 #ifndef VBOX_WITH_NATIVE_NEM
-VMM_INT_DECL(int) NEMHCQueryCpuTick(PVMCPU pVCpu, uint64_t *pcTicks, uint32_t *puAux)
+VMM_INT_DECL(int) NEMHCQueryCpuTick(PVMCPUCC pVCpu, uint64_t *pcTicks, uint32_t *puAux)
 {
     RT_NOREF(pVCpu, pcTicks, puAux);
@@ -144 +144 @@
 
 #ifndef VBOX_WITH_NATIVE_NEM
-VMM_INT_DECL(int) NEMHCResumeCpuTickOnAll(PVM pVM, PVMCPU pVCpu, uint64_t uPausedTscValue)
+VMM_INT_DECL(int) NEMHCResumeCpuTickOnAll(PVM pVM, PVMCPUCC pVCpu, uint64_t uPausedTscValue)
 {
     RT_NOREF(pVM, pVCpu, uPausedTscValue);