Changeset 95112 in vbox

Timestamp:

May 25, 2022 8:43:25 PM (3 years ago)

Author:

vboxsync

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

151593

Message:

VMM/PGMPool: Corrected pgmPoolAccessHandler declaration to use DECLCALLBACK (noexcept/c++17).

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPool.cpp (modified) (2 diffs)
• include/PGMInternal.h (modified) (1 diff)

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

@@ -938 +938 @@
  * @remarks The @a uUser argument is the index of the PGMPOOLPAGE.
  */
-DECLEXPORT(VBOXSTRICTRC) pgmRZPoolAccessPfHandler(PVMCC pVM, PVMCPUCC pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,
-                                                  RTGCPTR pvFault, RTGCPHYS GCPhysFault, uint64_t uUser)
+DECLCALLBACK(VBOXSTRICTRC) pgmRZPoolAccessPfHandler(PVMCC pVM, PVMCPUCC pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,
+                                                    RTGCPTR pvFault, RTGCPHYS GCPhysFault, uint64_t uUser)
 {
     STAM_PROFILE_START(&pVM->pgm.s.CTX_SUFF(pPool)->StatMonitorRZ, a);
@@ -1245 +1245 @@
  * @note    The @a uUser argument is the index of the PGMPOOLPAGE.
  */
-PGM_ALL_CB2_DECL(VBOXSTRICTRC)
+DECLCALLBACK(VBOXSTRICTRC)
 pgmPoolAccessHandler(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
                      PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, uint64_t uUser)

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -3746 +3746 @@
 void            pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
 void            pgmPoolMonitorModifiedInsert(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
-PGM_ALL_CB2_PROTO(FNPGMPHYSHANDLER) pgmPoolAccessHandler;
+FNPGMPHYSHANDLER     pgmPoolAccessHandler;
 #ifndef IN_RING3
-DECLEXPORT(FNPGMRZPHYSPFHANDLER)    pgmRZPoolAccessPfHandler;
+FNPGMRZPHYSPFHANDLER pgmRZPoolAccessPfHandler;
 #endif