VirtualBox

Changeset 108963 in vbox


Ignore:
Timestamp:
Apr 14, 2025 10:12:43 AM (4 weeks ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
168481
Message:

VMM/GMM: Eliminated IN_GMM_R3/R0.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/gmm.h

    r106061 r108963  
    5353 * @{
    5454 */
    55 
    56 /** @def IN_GMM_R0
    57  * Used to indicate whether we're inside the same link module as the ring 0
    58  * part of the Global Memory Manager or not.
    59  */
    60 #ifdef DOXYGEN_RUNNING
    61 # define IN_GMM_R0
    62 #endif
    63 /** @def GMMR0DECL
    64  * Ring 0 GMM export or import declaration.
    65  * @param   type    The return type of the function declaration.
    66  */
    67 #ifdef IN_GMM_R0
    68 # define GMMR0DECL(type)    DECLEXPORT(type) VBOXCALL
    69 #else
    70 # define GMMR0DECL(type)    DECLIMPORT(type) VBOXCALL
    71 #endif
    72 
    73 /** @def IN_GMM_R3
    74  * Used to indicate whether we're inside the same link module as the ring 3
    75  * part of the Global Memory Manager or not.
    76  */
    77 #ifdef DOXYGEN_RUNNING
    78 # define IN_GMM_R3
    79 #endif
    80 /** @def GMMR3DECL
    81  * Ring 3 GMM export or import declaration.
    82  * @param   type    The return type of the function declaration.
    83  */
    84 #ifdef IN_GMM_R3
    85 # define GMMR3DECL(type)    DECLEXPORT(type) VBOXCALL
    86 #else
    87 # define GMMR3DECL(type)    DECLIMPORT(type) VBOXCALL
    88 #endif
    89 
    9055
    9156/** The chunk shift. (2^21 = 2 MB) */
    … …  
    415380typedef const GMMSTATS *PCGMMSTATS;
    416381
    417 
    418 GMMR0DECL(int)  GMMR0Init(void);
    419 GMMR0DECL(void) GMMR0Term(void);
    420 GMMR0DECL(int)  GMMR0InitPerVMData(PGVM pGVM);
    421 GMMR0DECL(void) GMMR0CleanupVM(PGVM pGVM);
    422 GMMR0DECL(int)  GMMR0InitialReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages,
    423                                         GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority);
    424 GMMR0DECL(int)  GMMR0UpdateReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages);
    425 GMMR0DECL(int)  GMMR0AllocateHandyPages(PGVM pGVM, VMCPUID idCpu, uint32_t cPagesToUpdate,
    426                                         uint32_t cPagesToAlloc, PGMMPAGEDESC paPages);
    427 GMMR0DECL(int)  GMMR0AllocatePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount);
    428 GMMR0DECL(int)  GMMR0AllocateLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys);
    429 GMMR0DECL(int)  GMMR0FreePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount);
    430 GMMR0DECL(int)  GMMR0FreeLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t idPage);
    431 GMMR0DECL(int)  GMMR0BalloonedPages(PGVM pGVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages);
    432 GMMR0DECL(int)  GMMR0MapUnmapChunk(PGVM pGVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3);
    433 GMMR0DECL(int)  GMMR0PageIdToVirt(PGVM pGVM, uint32_t idPage, void **ppv);
    434 GMMR0DECL(int)  GMMR0RegisterSharedModule(PGVM pGVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName,
    435                                           char *pszVersion, RTGCPTR GCBaseAddr,  uint32_t cbModule, uint32_t cRegions,
    436                                           struct VMMDEVSHAREDREGIONDESC const *paRegions);
    437 GMMR0DECL(int)  GMMR0UnregisterSharedModule(PGVM pGVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion,
    438                                             RTGCPTR GCBaseAddr, uint32_t cbModule);
    439 GMMR0DECL(int)  GMMR0UnregisterAllSharedModules(PGVM pGVM, VMCPUID idCpu);
    440 GMMR0DECL(int)  GMMR0CheckSharedModules(PGVM pGVM, VMCPUID idCpu);
    441 GMMR0DECL(int)  GMMR0ResetSharedModules(PGVM pGVM, VMCPUID idCpu);
    442 GMMR0DECL(int)  GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession);
    443 GMMR0DECL(int)  GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession);
     382VMMR0_INT_DECL(int)  GMMR0Init(void);
     383VMMR0_INT_DECL(void) GMMR0Term(void);
     384VMMR0_INT_DECL(int)  GMMR0InitPerVMData(PGVM pGVM);
     385VMMR0_INT_DECL(void) GMMR0CleanupVM(PGVM pGVM);
     386VMMR0_INT_DECL(int)  GMMR0InitialReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages,
     387                                             uint32_t cFixedPages, GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority);
     388VMMR0_INT_DECL(int)  GMMR0UpdateReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages,
     389                                            uint32_t cShadowPages, uint32_t cFixedPages);
     390VMMR0_INT_DECL(int)  GMMR0AllocateHandyPages(PGVM pGVM, VMCPUID idCpu, uint32_t cPagesToUpdate,
     391                                             uint32_t cPagesToAlloc, PGMMPAGEDESC paPages);
     392VMMR0_INT_DECL(int)  GMMR0AllocatePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount);
     393VMMR0_INT_DECL(int)  GMMR0AllocateLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys);
     394VMMR0_INT_DECL(int)  GMMR0FreePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount);
     395VMMR0_INT_DECL(int)  GMMR0FreeLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t idPage);
     396VMMR0_INT_DECL(int)  GMMR0BalloonedPages(PGVM pGVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages);
     397VMMR0_INT_DECL(int)  GMMR0MapUnmapChunk(PGVM pGVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3);
     398VMMR0_INT_DECL(int)  GMMR0PageIdToVirt(PGVM pGVM, uint32_t idPage, void **ppv);
     399VMMR0_INT_DECL(int)  GMMR0RegisterSharedModule(PGVM pGVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName,
     400                                               char *pszVersion, RTGCPTR GCBaseAddr,  uint32_t cbModule, uint32_t cRegions,
     401                                               struct VMMDEVSHAREDREGIONDESC const *paRegions);
     402VMMR0_INT_DECL(int)  GMMR0UnregisterSharedModule(PGVM pGVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion,
     403                                                 RTGCPTR GCBaseAddr, uint32_t cbModule);
     404VMMR0_INT_DECL(int)  GMMR0UnregisterAllSharedModules(PGVM pGVM, VMCPUID idCpu);
     405VMMR0_INT_DECL(int)  GMMR0CheckSharedModules(PGVM pGVM, VMCPUID idCpu);
     406VMMR0_INT_DECL(int)  GMMR0ResetSharedModules(PGVM pGVM, VMCPUID idCpu);
     407VMMR0_INT_DECL(int)  GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession);
     408VMMR0_INT_DECL(int)  GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession);
    444409
    445410/**
    … …  
    460425typedef GMMINITIALRESERVATIONREQ *PGMMINITIALRESERVATIONREQ;
    461426
    462 GMMR0DECL(int)  GMMR0InitialReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq);
     427VMMR0_INT_DECL(int)  GMMR0InitialReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq);
    463428
    464429
    … …  
    478443typedef GMMUPDATERESERVATIONREQ *PGMMUPDATERESERVATIONREQ;
    479444
    480 GMMR0DECL(int)  GMMR0UpdateReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq);
     445VMMR0_INT_DECL(int)  GMMR0UpdateReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq);
    481446
    482447
    … …  
    499464typedef GMMALLOCATEPAGESREQ *PGMMALLOCATEPAGESREQ;
    500465
    501 GMMR0DECL(int)  GMMR0AllocatePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq);
     466VMMR0_INT_DECL(int)  GMMR0AllocatePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq);
    502467
    503468
    … …  
    520485typedef GMMFREEPAGESREQ *PGMMFREEPAGESREQ;
    521486
    522 GMMR0DECL(int)  GMMR0FreePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq);
     487VMMR0_INT_DECL(int)  GMMR0FreePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq);
    523488
    524489/**
    … …  
    538503typedef GMMBALLOONEDPAGESREQ *PGMMBALLOONEDPAGESREQ;
    539504
    540 GMMR0DECL(int)  GMMR0BalloonedPagesReq(PGVM pGVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq);
     505VMMR0_INT_DECL(int)  GMMR0BalloonedPagesReq(PGVM pGVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq);
    541506
    542507
    … …  
    563528typedef GMMMEMSTATSREQ *PGMMMEMSTATSREQ;
    564529
    565 GMMR0DECL(int)  GMMR0QueryHypervisorMemoryStatsReq(PGMMMEMSTATSREQ pReq);
    566 GMMR0DECL(int)  GMMR0QueryMemoryStatsReq(PGVM pGVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq);
     530VMMR0_INT_DECL(int)  GMMR0QueryHypervisorMemoryStatsReq(PGMMMEMSTATSREQ pReq);
     531VMMR0_INT_DECL(int)  GMMR0QueryMemoryStatsReq(PGVM pGVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq);
    567532
    568533/**
    … …  
    584549typedef GMMMAPUNMAPCHUNKREQ *PGMMMAPUNMAPCHUNKREQ;
    585550
    586 GMMR0DECL(int)  GMMR0MapUnmapChunkReq(PGVM pGVM, PGMMMAPUNMAPCHUNKREQ pReq);
     551VMMR0_INT_DECL(int)  GMMR0MapUnmapChunkReq(PGVM pGVM, PGMMMAPUNMAPCHUNKREQ pReq);
    587552
    588553
    … …  
    601566typedef GMMFREELARGEPAGEREQ *PGMMFREELARGEPAGEREQ;
    602567
    603 GMMR0DECL(int) GMMR0FreeLargePageReq(PGVM pGVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq);
     568VMMR0_INT_DECL(int) GMMR0FreeLargePageReq(PGVM pGVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq);
    604569
    605570/** Maximum length of the shared module name string, terminator included. */
    … …  
    636601typedef GMMREGISTERSHAREDMODULEREQ *PGMMREGISTERSHAREDMODULEREQ;
    637602
    638 GMMR0DECL(int) GMMR0RegisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq);
     603VMMR0_INT_DECL(int) GMMR0RegisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq);
    639604
    640605/**
    … …  
    698663typedef GMMSHAREDPAGEDESC *PGMMSHAREDPAGEDESC;
    699664
    700 GMMR0DECL(int) GMMR0SharedModuleCheckPage(PGVM pGVM, PGMMSHAREDMODULE pModule, uint32_t idxRegion, uint32_t idxPage,
    701                                           PGMMSHAREDPAGEDESC pPageDesc);
     665VMMR0_INT_DECL(int) GMMR0SharedModuleCheckPage(PGVM pGVM, PGMMSHAREDMODULE pModule, uint32_t idxRegion, uint32_t idxPage,
     666                                               PGMMSHAREDPAGEDESC pPageDesc);
    702667
    703668/**
    … …  
    723688typedef GMMUNREGISTERSHAREDMODULEREQ *PGMMUNREGISTERSHAREDMODULEREQ;
    724689
    725 GMMR0DECL(int) GMMR0UnregisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq);
     690VMMR0_INT_DECL(int) GMMR0UnregisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq);
    726691
    727692#if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
    … …  
    742707typedef GMMFINDDUPLICATEPAGEREQ *PGMMFINDDUPLICATEPAGEREQ;
    743708
    744 GMMR0DECL(int) GMMR0FindDuplicatePageReq(PGVM pGVM, PGMMFINDDUPLICATEPAGEREQ pReq);
     709VMMR0_INT_DECL(int) GMMR0FindDuplicatePageReq(PGVM pGVM, PGMMFINDDUPLICATEPAGEREQ pReq);
    745710#endif /* VBOX_STRICT && HC_ARCH_BITS == 64 */
    746711
    … …  
    763728typedef GMMQUERYSTATISTICSSREQ *PGMMQUERYSTATISTICSSREQ;
    764729
    765 GMMR0DECL(int)      GMMR0QueryStatisticsReq(PGVM pGVM, PGMMQUERYSTATISTICSSREQ pReq);
     730VMMR0_INT_DECL(int)      GMMR0QueryStatisticsReq(PGVM pGVM, PGMMQUERYSTATISTICSSREQ pReq);
    766731
    767732
    … …  
    784749typedef GMMRESETSTATISTICSSREQ *PGMMRESETSTATISTICSSREQ;
    785750
    786 GMMR0DECL(int)      GMMR0ResetStatisticsReq(PGVM pGVM, PGMMRESETSTATISTICSSREQ pReq);
     751VMMR0_INT_DECL(int)      GMMR0ResetStatisticsReq(PGVM pGVM, PGMMRESETSTATISTICSSREQ pReq);
    787752
    788753
    … …  
    792757 * @{
    793758 */
    794 GMMR3DECL(int)  GMMR3InitialReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages,
    795                                         GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority);
    796 GMMR3DECL(int)  GMMR3UpdateReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages);
    797 GMMR3DECL(int)  GMMR3AllocatePagesPrepare(PVM pVM, PGMMALLOCATEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount);
    798 GMMR3DECL(int)  GMMR3AllocatePagesPerform(PVM pVM, PGMMALLOCATEPAGESREQ pReq);
    799 GMMR3DECL(void) GMMR3AllocatePagesCleanup(PGMMALLOCATEPAGESREQ pReq);
    800 GMMR3DECL(int)  GMMR3FreePagesPrepare(PVM pVM, PGMMFREEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount);
    801 GMMR3DECL(void) GMMR3FreePagesRePrep(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cPages, GMMACCOUNT enmAccount);
    802 GMMR3DECL(int)  GMMR3FreePagesPerform(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cActualPages);
    803 GMMR3DECL(void) GMMR3FreePagesCleanup(PGMMFREEPAGESREQ pReq);
    804 GMMR3DECL(void) GMMR3FreeAllocatedPages(PVM pVM, GMMALLOCATEPAGESREQ const *pAllocReq);
    805 GMMR3DECL(int)  GMMR3AllocateLargePage(PVM pVM,  uint32_t cbPage);
    806 GMMR3DECL(int)  GMMR3FreeLargePage(PVM pVM,  uint32_t idPage);
    807 GMMR3DECL(int)  GMMR3MapUnmapChunk(PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3);
    808 GMMR3DECL(int)  GMMR3QueryHypervisorMemoryStats(PVM pVM, uint64_t *pcTotalAllocPages, uint64_t *pcTotalFreePages, uint64_t *pcTotalBalloonPages, uint64_t *puTotalBalloonSize);
    809 GMMR3DECL(int)  GMMR3QueryMemoryStats(PVM pVM, uint64_t *pcAllocPages, uint64_t *pcMaxPages, uint64_t *pcBalloonPages);
    810 GMMR3DECL(int)  GMMR3BalloonedPages(PVM pVM, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages);
    811 GMMR3DECL(int)  GMMR3RegisterSharedModule(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq);
    812 GMMR3DECL(int)  GMMR3UnregisterSharedModule(PVM pVM, PGMMUNREGISTERSHAREDMODULEREQ pReq);
    813 GMMR3DECL(int)  GMMR3CheckSharedModules(PVM pVM);
    814 GMMR3DECL(int)  GMMR3ResetSharedModules(PVM pVM);
     759VMMR3_INT_DECL(int)  GMMR3InitialReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages,
     760                                             GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority);
     761VMMR3_INT_DECL(int)  GMMR3UpdateReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages);
     762VMMR3_INT_DECL(int)  GMMR3AllocatePagesPrepare(PVM pVM, PGMMALLOCATEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount);
     763VMMR3_INT_DECL(int)  GMMR3AllocatePagesPerform(PVM pVM, PGMMALLOCATEPAGESREQ pReq);
     764VMMR3_INT_DECL(void) GMMR3AllocatePagesCleanup(PGMMALLOCATEPAGESREQ pReq);
     765VMMR3_INT_DECL(int)  GMMR3FreePagesPrepare(PVM pVM, PGMMFREEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount);
     766VMMR3_INT_DECL(void) GMMR3FreePagesRePrep(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cPages, GMMACCOUNT enmAccount);
     767VMMR3_INT_DECL(int)  GMMR3FreePagesPerform(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cActualPages);
     768VMMR3_INT_DECL(void) GMMR3FreePagesCleanup(PGMMFREEPAGESREQ pReq);
     769VMMR3_INT_DECL(void) GMMR3FreeAllocatedPages(PVM pVM, GMMALLOCATEPAGESREQ const *pAllocReq);
     770VMMR3_INT_DECL(int)  GMMR3AllocateLargePage(PVM pVM,  uint32_t cbPage);
     771VMMR3_INT_DECL(int)  GMMR3FreeLargePage(PVM pVM,  uint32_t idPage);
     772VMMR3_INT_DECL(int)  GMMR3MapUnmapChunk(PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3);
     773VMMR3_INT_DECL(int)  GMMR3QueryHypervisorMemoryStats(PVM pVM, uint64_t *pcTotalAllocPages, uint64_t *pcTotalFreePages,
     774                                                     uint64_t *pcTotalBalloonPages, uint64_t *puTotalBalloonSize);
     775VMMR3_INT_DECL(int)  GMMR3QueryMemoryStats(PVM pVM, uint64_t *pcAllocPages, uint64_t *pcMaxPages, uint64_t *pcBalloonPages);
     776VMMR3_INT_DECL(int)  GMMR3BalloonedPages(PVM pVM, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages);
     777VMMR3_INT_DECL(int)  GMMR3RegisterSharedModule(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq);
     778VMMR3_INT_DECL(int)  GMMR3UnregisterSharedModule(PVM pVM, PGMMUNREGISTERSHAREDMODULEREQ pReq);
     779VMMR3_INT_DECL(int)  GMMR3CheckSharedModules(PVM pVM);
     780VMMR3_INT_DECL(int)  GMMR3ResetSharedModules(PVM pVM);
    815781
    816782# if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
    817 GMMR3DECL(bool) GMMR3IsDuplicatePage(PVM pVM, uint32_t idPage);
     783VMMR3_INT_DECL(bool) GMMR3IsDuplicatePage(PVM pVM, uint32_t idPage);
    818784# endif
    819785

  • trunk/src/VBox/VMM/Makefile.kmk

    r108953 r108963  
    6262VBoxVMM_SONAME.linux = VBoxVMM.so
    6363
    64 VBoxVMM_DEFS     = VBOX_VMM_TARGET_X86 VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_GMM_R3 IN_DBG $(VMM_COMMON_DEFS)
    65 ## @todo eliminate IN_GMM_R3
     64VBoxVMM_DEFS     = VBOX_VMM_TARGET_X86 VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_DBG $(VMM_COMMON_DEFS)
    6665ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    6766 VBoxVMM_DEFS   += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    … …  
    411410 VBoxVMMArm_SONAME.linux = VBoxVMMArm.so
    412411
    413  VBoxVMMArm_DEFS     = VBOX_VMM_TARGET_ARMV8 VBOX_DIS_WITH_ARMV8 VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_DBG IN_GMM_R3 \
     412 VBoxVMMArm_DEFS     = VBOX_VMM_TARGET_ARMV8 VBOX_DIS_WITH_ARMV8 VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_DBG \
    414413        $(filter-out \
    415414                VBOX_WITH_IEM_RECOMPILER \
    … …  
    889888 VMMR0_SYSSUFF   = .r0
    890889
    891  VMMR0_DEFS      = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 \
     890 VMMR0_DEFS      = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_INTNET_R0 \
    892891        $(VMM_COMMON_DEFS) RTASSERT_HAVE_SHOULD_PANIC
    893  ## @todo eliminate IN_GVMM_R0 IN_GMM_R0
     892 ## @todo eliminate IN_GVMM_R0
    894893 ifdef VBOX_WITH_PCI_PASSTHROUGH
    895894  VMMR0_DEFS     += IN_PCIRAW_R0

  • trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

    r106061 r108963  
    740740 * @returns VBox status code.
    741741 */
    742 GMMR0DECL(int) GMMR0Init(void)
     742VMMR0_INT_DECL(int) GMMR0Init(void)
    743743{
    744744    LogFlow(("GMMInit:\n"));
    … …  
    850850 * Terminates the GMM component.
    851851 */
    852 GMMR0DECL(void) GMMR0Term(void)
     852VMMR0_INT_DECL(void) GMMR0Term(void)
    853853{
    854854    LogFlow(("GMMTerm:\n"));
    … …  
    943943 * @param   pGVM    Pointer to the Global VM structure.
    944944 */
    945 GMMR0DECL(int) GMMR0InitPerVMData(PGVM pGVM)
     945VMMR0_INT_DECL(int) GMMR0InitPerVMData(PGVM pGVM)
    946946{
    947947    AssertCompile(RT_SIZEOFMEMB(GVM,gmm.s) <= RT_SIZEOFMEMB(GVM,gmm.padding));
    … …  
    12261226 * @param   pGVM    Pointer to the Global VM structure.
    12271227 */
    1228 GMMR0DECL(void) GMMR0CleanupVM(PGVM pGVM)
     1228VMMR0_INT_DECL(void) GMMR0CleanupVM(PGVM pGVM)
    12291229{
    12301230    LogFlow(("GMMR0CleanupVM: pGVM=%p:{.hSelf=%#x}\n", pGVM, pGVM->hSelf));
    … …  
    15631563 * @thread  The creator thread / EMT(0).
    15641564 */
    1565 GMMR0DECL(int) GMMR0InitialReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages,
    1566                                        uint32_t cFixedPages, GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority)
     1565VMMR0_INT_DECL(int) GMMR0InitialReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages,
     1566                                            uint32_t cFixedPages, GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority)
    15671567{
    15681568    LogFlow(("GMMR0InitialReservation: pGVM=%p cBasePages=%#llx cShadowPages=%#x cFixedPages=%#x enmPolicy=%d enmPriority=%d\n",
    … …  
    16321632 * @param   pReq            Pointer to the request packet.
    16331633 */
    1634 GMMR0DECL(int) GMMR0InitialReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq)
     1634VMMR0_INT_DECL(int) GMMR0InitialReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq)
    16351635{
    16361636    /*
    … …  
    16621662 * @thread  EMT(idCpu)
    16631663 */
    1664 GMMR0DECL(int) GMMR0UpdateReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages,
    1665                                       uint32_t cShadowPages, uint32_t cFixedPages)
     1664VMMR0_INT_DECL(int) GMMR0UpdateReservation(PGVM pGVM, VMCPUID idCpu, uint64_t cBasePages,
     1665                                           uint32_t cShadowPages, uint32_t cFixedPages)
    16661666{
    16671667    LogFlow(("GMMR0UpdateReservation: pGVM=%p cBasePages=%#llx cShadowPages=%#x cFixedPages=%#x\n",
    … …  
    17271727 * @param   pReq            Pointer to the request packet.
    17281728 */
    1729 GMMR0DECL(int) GMMR0UpdateReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq)
     1729VMMR0_INT_DECL(int) GMMR0UpdateReservationReq(PGVM pGVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq)
    17301730{
    17311731    /*
    … …  
    29592959 * @thread  EMT(idCpu)
    29602960 */
    2961 GMMR0DECL(int) GMMR0AllocateHandyPages(PGVM pGVM, VMCPUID idCpu, uint32_t cPagesToUpdate,
    2962                                        uint32_t cPagesToAlloc, PGMMPAGEDESC paPages)
     2961VMMR0_INT_DECL(int) GMMR0AllocateHandyPages(PGVM pGVM, VMCPUID idCpu, uint32_t cPagesToUpdate,
     2962                                            uint32_t cPagesToAlloc, PGMMPAGEDESC paPages)
    29632963{
    29642964    LogFlow(("GMMR0AllocateHandyPages: pGVM=%p cPagesToUpdate=%#x cPagesToAlloc=%#x paPages=%p\n",
    … …  
    31753175 * @thread  EMT.
    31763176 */
    3177 GMMR0DECL(int) GMMR0AllocatePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount)
     3177VMMR0_INT_DECL(int) GMMR0AllocatePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount)
    31783178{
    31793179    LogFlow(("GMMR0AllocatePages: pGVM=%p cPages=%#x paPages=%p enmAccount=%d\n", pGVM, cPages, paPages, enmAccount));
    … …  
    32393239 * @param   pReq        Pointer to the request packet.
    32403240 */
    3241 GMMR0DECL(int) GMMR0AllocatePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq)
     3241VMMR0_INT_DECL(int) GMMR0AllocatePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq)
    32423242{
    32433243    /*
    … …  
    32763276 * @param   pHCPhys     Where to return the host physical address of the page.
    32773277 */
    3278 GMMR0DECL(int)  GMMR0AllocateLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys)
     3278VMMR0_INT_DECL(int)  GMMR0AllocateLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys)
    32793279{
    32803280    LogFlow(("GMMR0AllocateLargePage: pGVM=%p cbPage=%x\n", pGVM, cbPage));
    … …  
    33943394 * @param   idPage      The large page id.
    33953395 */
    3396 GMMR0DECL(int)  GMMR0FreeLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t idPage)
     3396VMMR0_INT_DECL(int)  GMMR0FreeLargePage(PGVM pGVM, VMCPUID idCpu, uint32_t idPage)
    33973397{
    33983398    LogFlow(("GMMR0FreeLargePage: pGVM=%p idPage=%x\n", pGVM, idPage));
    … …  
    34563456 * @param   pReq        Pointer to the request packet.
    34573457 */
    3458 GMMR0DECL(int) GMMR0FreeLargePageReq(PGVM pGVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq)
     3458VMMR0_INT_DECL(int) GMMR0FreeLargePageReq(PGVM pGVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq)
    34593459{
    34603460    /*
    … …  
    38933893 * @thread  EMT.
    38943894 */
    3895 GMMR0DECL(int) GMMR0FreePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount)
     3895VMMR0_INT_DECL(int) GMMR0FreePages(PGVM pGVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount)
    38963896{
    38973897    LogFlow(("GMMR0FreePages: pGVM=%p cPages=%#x paPages=%p enmAccount=%d\n", pGVM, cPages, paPages, enmAccount));
    … …  
    39403940 * @param   pReq        Pointer to the request packet.
    39413941 */
    3942 GMMR0DECL(int) GMMR0FreePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq)
     3942VMMR0_INT_DECL(int) GMMR0FreePagesReq(PGVM pGVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq)
    39433943{
    39443944    /*
    … …  
    39803980 * @thread  EMT(idCpu)
    39813981 */
    3982 GMMR0DECL(int) GMMR0BalloonedPages(PGVM pGVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages)
     3982VMMR0_INT_DECL(int) GMMR0BalloonedPages(PGVM pGVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages)
    39833983{
    39843984    LogFlow(("GMMR0BalloonedPages: pGVM=%p enmAction=%d cBalloonedPages=%#x\n",
    … …  
    41084108 * @param   pReq        Pointer to the request packet.
    41094109 */
    4110 GMMR0DECL(int) GMMR0BalloonedPagesReq(PGVM pGVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq)
     4110VMMR0_INT_DECL(int) GMMR0BalloonedPagesReq(PGVM pGVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq)
    41114111{
    41124112    /*
    … …  
    41284128 * @param   pReq        Pointer to the request packet.
    41294129 */
    4130 GMMR0DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PGMMMEMSTATSREQ pReq)
     4130VMMR0_INT_DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PGMMMEMSTATSREQ pReq)
    41314131{
    41324132    /*
    … …  
    41644164 * @thread  EMT(idCpu)
    41654165 */
    4166 GMMR0DECL(int) GMMR0QueryMemoryStatsReq(PGVM pGVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq)
     4166VMMR0_INT_DECL(int) GMMR0QueryMemoryStatsReq(PGVM pGVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq)
    41674167{
    41684168    /*
    … …  
    44334433 * @thread  EMT ???
    44344434 */
    4435 GMMR0DECL(int) GMMR0MapUnmapChunk(PGVM pGVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3)
     4435VMMR0_INT_DECL(int) GMMR0MapUnmapChunk(PGVM pGVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3)
    44364436{
    44374437    LogFlow(("GMMR0MapUnmapChunk: pGVM=%p idChunkMap=%#x idChunkUnmap=%#x ppvR3=%p\n",
    … …  
    45214521 * @param   pReq        Pointer to the request packet.
    45224522 */
    4523 GMMR0DECL(int)  GMMR0MapUnmapChunkReq(PGVM pGVM, PGMMMAPUNMAPCHUNKREQ pReq)
     4523VMMR0_INT_DECL(int)  GMMR0MapUnmapChunkReq(PGVM pGVM, PGMMMAPUNMAPCHUNKREQ pReq)
    45244524{
    45254525    /*
    … …  
    45484548 * @thread  EMT
    45494549 */
    4550 GMMR0DECL(int)  GMMR0PageIdToVirt(PGVM pGVM, uint32_t idPage, void **ppv)
     4550VMMR0_INT_DECL(int)  GMMR0PageIdToVirt(PGVM pGVM, uint32_t idPage, void **ppv)
    45514551{
    45524552    *ppv = NULL;
    … …  
    48624862 * @thread  EMT(idCpu)
    48634863 */
    4864 GMMR0DECL(int) GMMR0RegisterSharedModule(PGVM pGVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName,
    4865                                          char *pszVersion, RTGCPTR GCPtrModBase, uint32_t cbModule,
    4866                                          uint32_t cRegions, struct VMMDEVSHAREDREGIONDESC const *paRegions)
     4864VMMR0_INT_DECL(int) GMMR0RegisterSharedModule(PGVM pGVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName,
     4865                                              char *pszVersion, RTGCPTR GCPtrModBase, uint32_t cbModule,
     4866                                              uint32_t cRegions, struct VMMDEVSHAREDREGIONDESC const *paRegions)
    48674867{
    48684868#ifdef VBOX_WITH_PAGE_SHARING
    … …  
    50025002 * @param   pReq        Pointer to the request packet.
    50035003 */
    5004 GMMR0DECL(int) GMMR0RegisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq)
     5004VMMR0_INT_DECL(int) GMMR0RegisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq)
    50055005{
    50065006    /*
    … …  
    50305030 * @param   cbModule        The module size.
    50315031 */
    5032 GMMR0DECL(int) GMMR0UnregisterSharedModule(PGVM pGVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion,
    5033                                            RTGCPTR GCPtrModBase, uint32_t cbModule)
     5032VMMR0_INT_DECL(int) GMMR0UnregisterSharedModule(PGVM pGVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion,
     5033                                                RTGCPTR GCPtrModBase, uint32_t cbModule)
    50345034{
    50355035#ifdef VBOX_WITH_PAGE_SHARING
    … …  
    50965096 * @param   pReq        Pointer to the request packet.
    50975097 */
    5098 GMMR0DECL(int)  GMMR0UnregisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq)
     5098VMMR0_INT_DECL(int)  GMMR0UnregisterSharedModuleReq(PGVM pGVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq)
    50995099{
    51005100    /*
    … …  
    52115211 * @param   pPageDesc   Page descriptor
    52125212 */
    5213 GMMR0DECL(int) GMMR0SharedModuleCheckPage(PGVM pGVM, PGMMSHAREDMODULE pModule, uint32_t idxRegion, uint32_t idxPage,
    5214                                           PGMMSHAREDPAGEDESC pPageDesc)
     5213VMMR0_INT_DECL(int) GMMR0SharedModuleCheckPage(PGVM pGVM, PGMMSHAREDMODULE pModule, uint32_t idxRegion, uint32_t idxPage,
     5214                                               PGMMSHAREDPAGEDESC pPageDesc)
    52155215{
    52165216    int     rc;
    … …  
    54005400 * @param   idCpu       The VCPU id.
    54015401 */
    5402 GMMR0DECL(int) GMMR0ResetSharedModules(PGVM pGVM, VMCPUID idCpu)
     5402VMMR0_INT_DECL(int) GMMR0ResetSharedModules(PGVM pGVM, VMCPUID idCpu)
    54035403{
    54045404#ifdef VBOX_WITH_PAGE_SHARING
    … …  
    54695469 * @thread  EMT(idCpu)
    54705470 */
    5471 GMMR0DECL(int) GMMR0CheckSharedModules(PGVM pGVM, VMCPUID idCpu)
     5471VMMR0_INT_DECL(int) GMMR0CheckSharedModules(PGVM pGVM, VMCPUID idCpu)
    54725472{
    54735473#ifdef VBOX_WITH_PAGE_SHARING
    … …  
    55625562 * @param   pReq        Pointer to the request packet.
    55635563 */
    5564 GMMR0DECL(int) GMMR0FindDuplicatePageReq(PGVM pGVM, PGMMFINDDUPLICATEPAGEREQ pReq)
     5564VMMR0_INT_DECL(int) GMMR0FindDuplicatePageReq(PGVM pGVM, PGMMFINDDUPLICATEPAGEREQ pReq)
    55655565{
    55665566    /*
    … …  
    56375637 * @param   pGVM        The GVM to obtain statistics for. Optional.
    56385638 */
    5639 GMMR0DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession, PGVM pGVM)
     5639VMMR0_INT_DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession, PGVM pGVM)
    56405640{
    56415641    LogFlow(("GVMMR0QueryStatistics: pStats=%p pSession=%p pGVM=%p\n", pStats, pSession, pGVM));
    … …  
    57035703 * @param   pReq        Pointer to the request packet.
    57045704 */
    5705 GMMR0DECL(int) GMMR0QueryStatisticsReq(PGVM pGVM, PGMMQUERYSTATISTICSSREQ pReq)
     5705VMMR0_INT_DECL(int) GMMR0QueryStatisticsReq(PGVM pGVM, PGMMQUERYSTATISTICSSREQ pReq)
    57065706{
    57075707    /*
    … …  
    57255725 * @param   pGVM        The GVM to reset statistics for. Optional.
    57265726 */
    5727 GMMR0DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession, PGVM pGVM)
     5727VMMR0_INT_DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession, PGVM pGVM)
    57285728{
    57295729    NOREF(pStats); NOREF(pSession); NOREF(pGVM);
    … …  
    57405740 * @param   pReq        Pointer to the request packet.
    57415741 */
    5742 GMMR0DECL(int) GMMR0ResetStatisticsReq(PGVM pGVM, PGMMRESETSTATISTICSSREQ pReq)
     5742VMMR0_INT_DECL(int) GMMR0ResetStatisticsReq(PGVM pGVM, PGMMRESETSTATISTICSSREQ pReq)
    57435743{
    57445744    /*

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

    r107171 r108963  
    4747 * @see GMMR0InitialReservation
    4848 */
    49 GMMR3DECL(int)  GMMR3InitialReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages,
    50                                         GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority)
     49VMMR3_INT_DECL(int)  GMMR3InitialReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages,
     50                                             GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority)
    5151{
    5252#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
    … …  
    7373 * @see GMMR0UpdateReservation
    7474 */
    75 GMMR3DECL(int)  GMMR3UpdateReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages)
     75VMMR3_INT_DECL(int)  GMMR3UpdateReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages)
    7676{
    7777#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
    … …  
    102102 * @param       enmAccount  The account to charge.
    103103 */
    104 GMMR3DECL(int) GMMR3AllocatePagesPrepare(PVM pVM, PGMMALLOCATEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount)
     104VMMR3_INT_DECL(int) GMMR3AllocatePagesPrepare(PVM pVM, PGMMALLOCATEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount)
    105105{
    106106    uint32_t cb = RT_UOFFSETOF_DYN(GMMALLOCATEPAGESREQ, aPages[cPages]);
    … …  
    128128 * @param   pReq        Pointer to the request (returned by GMMR3AllocatePagesPrepare).
    129129 */
    130 GMMR3DECL(int) GMMR3AllocatePagesPerform(PVM pVM, PGMMALLOCATEPAGESREQ pReq)
     130VMMR3_INT_DECL(int) GMMR3AllocatePagesPerform(PVM pVM, PGMMALLOCATEPAGESREQ pReq)
    131131{
    132132    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_ALLOCATE_PAGES, 0, &pReq->Hdr);
    … …  
    148148 * @param   pReq        Pointer to the request (returned by GMMR3AllocatePagesPrepare).
    149149 */
    150 GMMR3DECL(void) GMMR3AllocatePagesCleanup(PGMMALLOCATEPAGESREQ pReq)
     150VMMR3_INT_DECL(void) GMMR3AllocatePagesCleanup(PGMMALLOCATEPAGESREQ pReq)
    151151{
    152152    RTMemTmpFree(pReq);
    … …  
    163163 * @param       enmAccount  The account to charge.
    164164 */
    165 GMMR3DECL(int) GMMR3FreePagesPrepare(PVM pVM, PGMMFREEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount)
     165VMMR3_INT_DECL(int) GMMR3FreePagesPrepare(PVM pVM, PGMMFREEPAGESREQ *ppReq, uint32_t cPages, GMMACCOUNT enmAccount)
    166166{
    167167    uint32_t cb = RT_UOFFSETOF_DYN(GMMFREEPAGESREQ, aPages[cPages]);
    … …  
    190190 * @param       enmAccount  The account to charge.
    191191 */
    192 GMMR3DECL(void) GMMR3FreePagesRePrep(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cPages, GMMACCOUNT enmAccount)
     192VMMR3_INT_DECL(void) GMMR3FreePagesRePrep(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cPages, GMMACCOUNT enmAccount)
    193193{
    194194    Assert(pReq->Hdr.u32Magic == SUPVMMR0REQHDR_MAGIC);
    … …  
    209209 * @param   cActualPages    The number of pages actually freed.
    210210 */
    211 GMMR3DECL(int) GMMR3FreePagesPerform(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cActualPages)
     211VMMR3_INT_DECL(int) GMMR3FreePagesPerform(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t cActualPages)
    212212{
    213213    /*
    … …  
    240240 * @param   pReq        Pointer to the request (returned by GMMR3FreePagesPrepare).
    241241 */
    242 GMMR3DECL(void) GMMR3FreePagesCleanup(PGMMFREEPAGESREQ pReq)
     242VMMR3_INT_DECL(void) GMMR3FreePagesCleanup(PGMMFREEPAGESREQ pReq)
    243243{
    244244    RTMemTmpFree(pReq);
    … …  
    254254 * @param   pAllocReq   The allocation request to undo.
    255255 */
    256 GMMR3DECL(void) GMMR3FreeAllocatedPages(PVM pVM, GMMALLOCATEPAGESREQ const *pAllocReq)
     256VMMR3_INT_DECL(void) GMMR3FreeAllocatedPages(PVM pVM, GMMALLOCATEPAGESREQ const *pAllocReq)
    257257{
    258258    uint32_t cb = RT_UOFFSETOF_DYN(GMMFREEPAGESREQ, aPages[pAllocReq->cPages]);
    … …  
    282282 * @see GMMR0BalloonedPages
    283283 */
    284 GMMR3DECL(int)  GMMR3BalloonedPages(PVM pVM, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages)
     284VMMR3_INT_DECL(int)  GMMR3BalloonedPages(PVM pVM, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages)
    285285{
    286286    int rc;
    … …  
    310310 * @see  GMMR0QueryVMMMemoryStatsReq
    311311 */
    312 GMMR3DECL(int)  GMMR3QueryHypervisorMemoryStats(PVM pVM, uint64_t *pcTotalAllocPages, uint64_t *pcTotalFreePages, uint64_t *pcTotalBalloonPages, uint64_t *puTotalBalloonSize)
     312VMMR3_INT_DECL(int)  GMMR3QueryHypervisorMemoryStats(PVM pVM, uint64_t *pcTotalAllocPages, uint64_t *pcTotalFreePages,
     313                                                     uint64_t *pcTotalBalloonPages, uint64_t *puTotalBalloonSize)
    313314{
    314315    GMMMEMSTATSREQ Req;
    … …  
    341342 * @see GMMR0QueryMemoryStatsReq
    342343 */
    343 GMMR3DECL(int)  GMMR3QueryMemoryStats(PVM pVM, uint64_t *pcAllocPages, uint64_t *pcMaxPages, uint64_t *pcBalloonPages)
     344VMMR3_INT_DECL(int)  GMMR3QueryMemoryStats(PVM pVM, uint64_t *pcAllocPages, uint64_t *pcMaxPages, uint64_t *pcBalloonPages)
    344345{
    345346    GMMMEMSTATSREQ Req;
    … …  
    368369 * @see GMMR0MapUnmapChunk
    369370 */
    370 GMMR3DECL(int)  GMMR3MapUnmapChunk(PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3)
     371VMMR3_INT_DECL(int)  GMMR3MapUnmapChunk(PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3)
    371372{
    372373    GMMMAPUNMAPCHUNKREQ Req;
    … …  
    386387 * @see GMMR0FreeLargePage
    387388 */
    388 GMMR3DECL(int)  GMMR3FreeLargePage(PVM pVM,  uint32_t idPage)
     389VMMR3_INT_DECL(int)  GMMR3FreeLargePage(PVM pVM,  uint32_t idPage)
    389390{
    390391    GMMFREELARGEPAGEREQ Req;
    … …  
    399400 * @see GMMR0RegisterSharedModule
    400401 */
    401 GMMR3DECL(int) GMMR3RegisterSharedModule(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq)
     402VMMR3_INT_DECL(int) GMMR3RegisterSharedModule(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq)
    402403{
    403404    pReq->Hdr.u32Magic  = SUPVMMR0REQHDR_MAGIC;
    … …  
    413414 * @see GMMR0RegisterSharedModule
    414415 */
    415 GMMR3DECL(int) GMMR3UnregisterSharedModule(PVM pVM, PGMMUNREGISTERSHAREDMODULEREQ pReq)
     416VMMR3_INT_DECL(int) GMMR3UnregisterSharedModule(PVM pVM, PGMMUNREGISTERSHAREDMODULEREQ pReq)
    416417{
    417418    pReq->Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
    … …  
    424425 * @see GMMR0ResetSharedModules
    425426 */
    426 GMMR3DECL(int) GMMR3ResetSharedModules(PVM pVM)
     427VMMR3_INT_DECL(int) GMMR3ResetSharedModules(PVM pVM)
    427428{
    428429    if (!SUPR3IsDriverless())
    … …  
    435436 * @see GMMR0CheckSharedModules
    436437 */
    437 GMMR3DECL(int)  GMMR3CheckSharedModules(PVM pVM)
     438VMMR3_INT_DECL(int)  GMMR3CheckSharedModules(PVM pVM)
    438439{
    439440    return VMMR3CallR0(pVM, VMMR0_DO_GMM_CHECK_SHARED_MODULES, 0, NULL);
    … …  
    445446 * @see GMMR0FindDuplicatePage
    446447 */
    447 GMMR3DECL(bool) GMMR3IsDuplicatePage(PVM pVM, uint32_t idPage)
     448VMMR3_INT_DECL(bool) GMMR3IsDuplicatePage(PVM pVM, uint32_t idPage)
    448449{
    449450    GMMFINDDUPLICATEPAGEREQ Req;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette