Index: /trunk/include/VBox/tm.h
===================================================================
--- /trunk/include/VBox/tm.h	(revision 22807)
+++ /trunk/include/VBox/tm.h	(revision 22808)
@@ -84,14 +84,14 @@
 
 
-VMMDECL(void)     TMNotifyStartOfExecution(PVMCPU pVCpu);
-VMMDECL(void)     TMNotifyEndOfExecution(PVMCPU pVCpu);
-VMMDECL(void)     TMNotifyStartOfHalt(PVMCPU pVCpu);
-VMMDECL(void)     TMNotifyEndOfHalt(PVMCPU pVCpu);
+VMMDECL(void)           TMNotifyStartOfExecution(PVMCPU pVCpu);
+VMMDECL(void)           TMNotifyEndOfExecution(PVMCPU pVCpu);
+VMM_INT_DECL(void)      TMNotifyStartOfHalt(PVMCPU pVCpu);
+VMM_INT_DECL(void)      TMNotifyEndOfHalt(PVMCPU pVCpu);
 #ifdef IN_RING3
-VMMR3DECL(int)    TMR3NotifySuspend(PVM pVM, PVMCPU pVCpu);
-VMMR3DECL(int)    TMR3NotifyResume(PVM pVM, PVMCPU pVCpu);
-VMMR3DECL(int)    TMR3SetWarpDrive(PVM pVM, uint32_t u32Percent);
+VMMR3DECL(int)          TMR3NotifySuspend(PVM pVM, PVMCPU pVCpu);
+VMMR3DECL(int)          TMR3NotifyResume(PVM pVM, PVMCPU pVCpu);
+VMMR3DECL(int)          TMR3SetWarpDrive(PVM pVM, uint32_t u32Percent);
 #endif
-VMMDECL(uint32_t) TMGetWarpDrive(PVM pVM);
+VMMDECL(uint32_t)       TMGetWarpDrive(PVM pVM);
 
 
@@ -99,6 +99,6 @@
  * @{
  */
-VMMDECL(uint64_t) TMRealGet(PVM pVM);
-VMMDECL(uint64_t) TMRealGetFreq(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMRealGet(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMRealGetFreq(PVM pVM);
 /** @} */
 
@@ -107,18 +107,18 @@
  * @{
  */
-VMMDECL(uint64_t) TMVirtualGet(PVM pVM);
-VMMDECL(uint64_t) TMVirtualGetNoCheck(PVM pVM);
-VMMDECL(uint64_t) TMVirtualSyncGetLag(PVM pVM);
-VMMDECL(uint32_t) TMVirtualSyncGetCatchUpPct(PVM pVM);
-VMMDECL(uint64_t) TMVirtualGetFreq(PVM pVM);
-VMMDECL(uint64_t) TMVirtualSyncGet(PVM pVM);
-VMMDECL(uint64_t) TMVirtualSyncGetNoCheck(PVM pVM);
-VMMDECL(uint64_t) TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers);
-VMMDECL(uint64_t) TMVirtualToNano(PVM pVM, uint64_t u64VirtualTicks);
-VMMDECL(uint64_t) TMVirtualToMicro(PVM pVM, uint64_t u64VirtualTicks);
-VMMDECL(uint64_t) TMVirtualToMilli(PVM pVM, uint64_t u64VirtualTicks);
-VMMDECL(uint64_t) TMVirtualFromNano(PVM pVM, uint64_t u64NanoTS);
-VMMDECL(uint64_t) TMVirtualFromMicro(PVM pVM, uint64_t u64MicroTS);
-VMMDECL(uint64_t) TMVirtualFromMilli(PVM pVM, uint64_t u64MilliTS);
+VMM_INT_DECL(uint64_t)  TMVirtualGet(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMVirtualGetNoCheck(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMVirtualSyncGetLag(PVM pVM);
+VMM_INT_DECL(uint32_t)  TMVirtualSyncGetCatchUpPct(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMVirtualGetFreq(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMVirtualSyncGet(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMVirtualSyncGetNoCheck(PVM pVM);
+VMM_INT_DECL(uint64_t)  TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers);
+VMM_INT_DECL(uint64_t)  TMVirtualToNano(PVM pVM, uint64_t u64VirtualTicks);
+VMM_INT_DECL(uint64_t)  TMVirtualToMicro(PVM pVM, uint64_t u64VirtualTicks);
+VMM_INT_DECL(uint64_t)  TMVirtualToMilli(PVM pVM, uint64_t u64VirtualTicks);
+VMM_INT_DECL(uint64_t)  TMVirtualFromNano(PVM pVM, uint64_t u64NanoTS);
+VMM_INT_DECL(uint64_t)  TMVirtualFromMicro(PVM pVM, uint64_t u64MicroTS);
+VMM_INT_DECL(uint64_t)  TMVirtualFromMilli(PVM pVM, uint64_t u64MilliTS);
 /** @} */
 
@@ -127,11 +127,11 @@
  * @{
  */
-VMMDECL(uint64_t) TMCpuTickGet(PVMCPU pVCpu);
-VMMDECL(uint64_t) TMCpuTickGetNoCheck(PVMCPU pVCpu);
-VMMDECL(bool)     TMCpuTickCanUseRealTSC(PVMCPU pVCpu, uint64_t *poffRealTSC);
-VMMDECL(int)      TMCpuTickSet(PVM pVM, PVMCPU pVCpu, uint64_t u64Tick);
-VMMDECL(int)      TMCpuTickSetLastSeen(PVMCPU pVCpu, uint64_t u64LastSeenTick);
-VMMDECL(uint64_t) TMCpuTickGetLastSeen(PVMCPU pVCpu);
-VMMDECL(uint64_t) TMCpuTicksPerSecond(PVM pVM);
+VMMDECL(uint64_t)       TMCpuTickGet(PVMCPU pVCpu);
+VMM_INT_DECL(uint64_t)  TMCpuTickGetNoCheck(PVMCPU pVCpu);
+VMM_INT_DECL(bool)      TMCpuTickCanUseRealTSC(PVMCPU pVCpu, uint64_t *poffRealTSC);
+VMM_INT_DECL(int)       TMCpuTickSet(PVM pVM, PVMCPU pVCpu, uint64_t u64Tick);
+VMM_INT_DECL(int)       TMCpuTickSetLastSeen(PVMCPU pVCpu, uint64_t u64LastSeenTick);
+VMM_INT_DECL(uint64_t)  TMCpuTickGetLastSeen(PVMCPU pVCpu);
+VMMDECL(uint64_t)       TMCpuTicksPerSecond(PVM pVM);
 /** @} */
 
@@ -192,29 +192,29 @@
 typedef FNTMTIMEREXT *PFNTMTIMEREXT;
 
-VMMDECL(PTMTIMERR3) TMTimerR3Ptr(PTMTIMER pTimer);
-VMMDECL(PTMTIMERR0) TMTimerR0Ptr(PTMTIMER pTimer);
-VMMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer);
-VMMDECL(int)        TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire);
-VMMDECL(int)        TMTimerSetRelative(PTMTIMER pTimer, uint64_t cTicksToNext, uint64_t *pu64Now);
-VMMDECL(int)        TMTimerSetMillies(PTMTIMER pTimer, uint32_t cMilliesToNext);
-VMMDECL(int)        TMTimerSetMicro(PTMTIMER pTimer, uint64_t cMicrosToNext);
-VMMDECL(int)        TMTimerSetNano(PTMTIMER pTimer, uint64_t cNanosToNext);
-VMMDECL(uint64_t)   TMTimerGet(PTMTIMER pTimer);
-VMMDECL(uint64_t)   TMTimerGetNano(PTMTIMER pTimer);
-VMMDECL(uint64_t)   TMTimerGetMicro(PTMTIMER pTimer);
-VMMDECL(uint64_t)   TMTimerGetMilli(PTMTIMER pTimer);
-VMMDECL(uint64_t)   TMTimerGetFreq(PTMTIMER pTimer);
-VMMDECL(uint64_t)   TMTimerGetExpire(PTMTIMER pTimer);
-VMMDECL(uint64_t)   TMTimerToNano(PTMTIMER pTimer, uint64_t u64Ticks);
-VMMDECL(uint64_t)   TMTimerToMicro(PTMTIMER pTimer, uint64_t u64Ticks);
-VMMDECL(uint64_t)   TMTimerToMilli(PTMTIMER pTimer, uint64_t u64Ticks);
-VMMDECL(uint64_t)   TMTimerFromNano(PTMTIMER pTimer, uint64_t u64NanoTS);
-VMMDECL(uint64_t)   TMTimerFromMicro(PTMTIMER pTimer, uint64_t u64MicroTS);
-VMMDECL(uint64_t)   TMTimerFromMilli(PTMTIMER pTimer, uint64_t u64MilliTS);
-VMMDECL(int)        TMTimerStop(PTMTIMER pTimer);
-VMMDECL(bool)       TMTimerIsActive(PTMTIMER pTimer);
-VMMDECL(bool)       TMTimerPollBool(PVM pVM, PVMCPU pVCpu);
-VMMDECL(void)       TMTimerPollVoid(PVM pVM, PVMCPU pVCpu);
-VMMDECL(uint64_t)   TMTimerPollGIP(PVM pVM, PVMCPU pVCpu, uint64_t *pu64Delta);
+VMMDECL(PTMTIMERR3)     TMTimerR3Ptr(PTMTIMER pTimer);
+VMMDECL(PTMTIMERR0)     TMTimerR0Ptr(PTMTIMER pTimer);
+VMMDECL(PTMTIMERRC)     TMTimerRCPtr(PTMTIMER pTimer);
+VMMDECL(int)            TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire);
+VMMDECL(int)            TMTimerSetRelative(PTMTIMER pTimer, uint64_t cTicksToNext, uint64_t *pu64Now);
+VMMDECL(int)            TMTimerSetMillies(PTMTIMER pTimer, uint32_t cMilliesToNext);
+VMMDECL(int)            TMTimerSetMicro(PTMTIMER pTimer, uint64_t cMicrosToNext);
+VMMDECL(int)            TMTimerSetNano(PTMTIMER pTimer, uint64_t cNanosToNext);
+VMMDECL(uint64_t)       TMTimerGet(PTMTIMER pTimer);
+VMMDECL(uint64_t)       TMTimerGetNano(PTMTIMER pTimer);
+VMMDECL(uint64_t)       TMTimerGetMicro(PTMTIMER pTimer);
+VMMDECL(uint64_t)       TMTimerGetMilli(PTMTIMER pTimer);
+VMMDECL(uint64_t)       TMTimerGetFreq(PTMTIMER pTimer);
+VMMDECL(uint64_t)       TMTimerGetExpire(PTMTIMER pTimer);
+VMMDECL(uint64_t)       TMTimerToNano(PTMTIMER pTimer, uint64_t u64Ticks);
+VMMDECL(uint64_t)       TMTimerToMicro(PTMTIMER pTimer, uint64_t u64Ticks);
+VMMDECL(uint64_t)       TMTimerToMilli(PTMTIMER pTimer, uint64_t u64Ticks);
+VMMDECL(uint64_t)       TMTimerFromNano(PTMTIMER pTimer, uint64_t u64NanoTS);
+VMMDECL(uint64_t)       TMTimerFromMicro(PTMTIMER pTimer, uint64_t u64MicroTS);
+VMMDECL(uint64_t)       TMTimerFromMilli(PTMTIMER pTimer, uint64_t u64MilliTS);
+VMMDECL(int)            TMTimerStop(PTMTIMER pTimer);
+VMMDECL(bool)           TMTimerIsActive(PTMTIMER pTimer);
+VMMDECL(bool)           TMTimerPollBool(PVM pVM, PVMCPU pVCpu);
+VMM_INT_DECL(void)      TMTimerPollVoid(PVM pVM, PVMCPU pVCpu);
+VMM_INT_DECL(uint64_t)  TMTimerPollGIP(PVM pVM, PVMCPU pVCpu, uint64_t *pu64Delta);
 
 /** @} */
@@ -226,25 +226,25 @@
  * @{
  */
-VMMR3DECL(int)    TMR3Init(PVM pVM);
-VMMR3DECL(int)    TMR3InitCPU(PVM pVM);
-VMMR3DECL(int)    TMR3InitFinalize(PVM pVM);
-VMMR3DECL(void)   TMR3Relocate(PVM pVM, RTGCINTPTR offDelta);
-VMMR3DECL(int)    TMR3Term(PVM pVM);
-VMMR3DECL(int)    TMR3TermCPU(PVM pVM);
-VMMR3DECL(void)   TMR3Reset(PVM pVM);
-VMMR3DECL(int)    TMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue);
-VMMR3DECL(int)    TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer);
-VMMR3DECL(int)    TMR3TimerCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer);
-VMMR3DECL(int)    TMR3TimerCreateInternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMERINT pfnCallback, void *pvUser, const char *pszDesc, PPTMTIMERR3 ppTimer);
-VMMR3DECL(PTMTIMERR3) TMR3TimerCreateExternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMEREXT pfnCallback, void *pvUser, const char *pszDesc);
-VMMR3DECL(int)    TMR3TimerDestroy(PTMTIMER pTimer);
-VMMR3DECL(int)    TMR3TimerDestroyDevice(PVM pVM, PPDMDEVINS pDevIns);
-VMMR3DECL(int)    TMR3TimerDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns);
-VMMR3DECL(int)    TMR3TimerSave(PTMTIMERR3 pTimer, PSSMHANDLE pSSM);
-VMMR3DECL(int)    TMR3TimerLoad(PTMTIMERR3 pTimer, PSSMHANDLE pSSM);
-VMMR3DECL(int)    TMR3TimerSetCritSect(PTMTIMERR3 pTimer, PPDMCRITSECT pCritSect);
-VMMR3DECL(void)   TMR3TimerQueuesDo(PVM pVM);
-VMMR3DECL(void)   TMR3VirtualSyncFF(PVM pVM, PVMCPU pVCpu);
-VMMR3DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime);
+VMM_INT_DECL(int)       TMR3Init(PVM pVM);
+VMM_INT_DECL(int)       TMR3InitCPU(PVM pVM);
+VMM_INT_DECL(int)       TMR3InitFinalize(PVM pVM);
+VMM_INT_DECL(void)      TMR3Relocate(PVM pVM, RTGCINTPTR offDelta);
+VMM_INT_DECL(int)       TMR3Term(PVM pVM);
+VMM_INT_DECL(int)       TMR3TermCPU(PVM pVM);
+VMM_INT_DECL(void)      TMR3Reset(PVM pVM);
+VMM_INT_DECL(int)       TMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue);
+VMM_INT_DECL(int)       TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer);
+VMM_INT_DECL(int)       TMR3TimerCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer);
+VMMR3DECL(int)          TMR3TimerCreateInternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMERINT pfnCallback, void *pvUser, const char *pszDesc, PPTMTIMERR3 ppTimer);
+VMMR3DECL(PTMTIMERR3)   TMR3TimerCreateExternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMEREXT pfnCallback, void *pvUser, const char *pszDesc);
+VMMR3DECL(int)          TMR3TimerDestroy(PTMTIMER pTimer);
+VMM_INT_DECL(int)       TMR3TimerDestroyDevice(PVM pVM, PPDMDEVINS pDevIns);
+VMM_INT_DECL(int)       TMR3TimerDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns);
+VMMR3DECL(int)          TMR3TimerSave(PTMTIMERR3 pTimer, PSSMHANDLE pSSM);
+VMMR3DECL(int)          TMR3TimerLoad(PTMTIMERR3 pTimer, PSSMHANDLE pSSM);
+VMMR3DECL(int)          TMR3TimerSetCritSect(PTMTIMERR3 pTimer, PPDMCRITSECT pCritSect);
+VMMR3DECL(void)         TMR3TimerQueuesDo(PVM pVM);
+VMM_INT_DECL(void)      TMR3VirtualSyncFF(PVM pVM, PVMCPU pVCpu);
+VMM_INT_DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime);
 /** @} */
 #endif /* IN_RING3 */
Index: /trunk/src/VBox/VMM/TM.cpp
===================================================================
--- /trunk/src/VBox/VMM/TM.cpp	(revision 22807)
+++ /trunk/src/VBox/VMM/TM.cpp	(revision 22808)
@@ -178,5 +178,5 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) TMR3Init(PVM pVM)
+VMM_INT_DECL(int) TMR3Init(PVM pVM)
 {
     LogFlow(("TMR3Init:\n"));
@@ -668,5 +668,5 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) TMR3InitCPU(PVM pVM)
+VMM_INT_DECL(int) TMR3InitCPU(PVM pVM)
 {
     LogFlow(("TMR3InitCPU\n"));
@@ -837,5 +837,5 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) TMR3InitFinalize(PVM pVM)
+VMM_INT_DECL(int) TMR3InitFinalize(PVM pVM)
 {
     int rc;
@@ -885,5 +885,5 @@
  * @param   offDelta    Relocation delta relative to old location.
  */
-VMMR3DECL(void) TMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
+VMM_INT_DECL(void) TMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
 {
     int rc;
@@ -933,5 +933,5 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) TMR3Term(PVM pVM)
+VMM_INT_DECL(int) TMR3Term(PVM pVM)
 {
     AssertMsg(pVM->tm.s.offVM, ("bad init order!\n"));
@@ -956,7 +956,7 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) TMR3TermCPU(PVM pVM)
-{
-    return 0;
+VMM_INT_DECL(int) TMR3TermCPU(PVM pVM)
+{
+    return VINF_SUCCESS;
 }
 
@@ -971,5 +971,5 @@
  * @param   pVM     VM handle.
  */
-VMMR3DECL(void) TMR3Reset(PVM pVM)
+VMM_INT_DECL(void) TMR3Reset(PVM pVM)
 {
     LogFlow(("TMR3Reset:\n"));
@@ -1024,5 +1024,5 @@
  * @remark  This has to     work before TMR3Relocate() is called.
  */
-VMMR3DECL(int) TMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue)
+VMM_INT_DECL(int) TMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
     if (!strcmp(pszSymbol, "g_pSUPGlobalInfoPage"))
@@ -1270,5 +1270,5 @@
  * @param   ppTimer         Where to store the timer on success.
  */
-VMMR3DECL(int) TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
+VMM_INT_DECL(int) TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
 {
     AssertReturn(!(fFlags & ~(TMTIMER_FLAGS_NO_CRIT_SECT)), VERR_INVALID_PARAMETER);
@@ -1307,6 +1307,6 @@
  * @param   ppTimer         Where to store the timer on success.
  */
-VMMR3DECL(int) TMR3TimerCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser,
-                                     uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
+VMM_INT_DECL(int) TMR3TimerCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser,
+                                        uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
 {
     AssertReturn(!(fFlags & ~(TMTIMER_FLAGS_NO_CRIT_SECT)), VERR_INVALID_PARAMETER);
@@ -1563,5 +1563,5 @@
  * @param   pDevIns         Device which timers should be destroyed.
  */
-VMMR3DECL(int) TMR3TimerDestroyDevice(PVM pVM, PPDMDEVINS pDevIns)
+VMM_INT_DECL(int) TMR3TimerDestroyDevice(PVM pVM, PPDMDEVINS pDevIns)
 {
     LogFlow(("TMR3TimerDestroyDevice: pDevIns=%p\n", pDevIns));
@@ -1596,5 +1596,5 @@
  * @param   pDrvIns         Driver which timers should be destroyed.
  */
-VMMR3DECL(int) TMR3TimerDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns)
+VMM_INT_DECL(int) TMR3TimerDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns)
 {
     LogFlow(("TMR3TimerDestroyDriver: pDrvIns=%p\n", pDrvIns));
@@ -2209,5 +2209,5 @@
  * @thread  EMTs
  */
-VMMR3DECL(void) TMR3VirtualSyncFF(PVM pVM, PVMCPU pVCpu)
+VMM_INT_DECL(void) TMR3VirtualSyncFF(PVM pVM, PVMCPU pVCpu)
 {
     Log2(("TMR3VirtualSyncFF:\n"));
@@ -2439,5 +2439,5 @@
  * @param   pTime           Where to store the time.
  */
-VMMR3DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime)
+VMM_INT_DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime)
 {
     RTTimeNow(pTime);
Index: /trunk/src/VBox/VMM/VMMAll/TMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/TMAll.cpp	(revision 22807)
+++ /trunk/src/VBox/VMM/VMMAll/TMAll.cpp	(revision 22808)
@@ -204,5 +204,5 @@
  * @param   pVCpu       The VMCPU to operate on.
  */
-VMMDECL(void) TMNotifyStartOfHalt(PVMCPU pVCpu)
+VMM_INT_DECL(void) TMNotifyStartOfHalt(PVMCPU pVCpu)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -224,5 +224,5 @@
  * @param   pVCpu       The VMCPU to operate on.
  */
-VMMDECL(void) TMNotifyEndOfHalt(PVMCPU pVCpu)
+VMM_INT_DECL(void) TMNotifyEndOfHalt(PVMCPU pVCpu)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -681,5 +681,5 @@
  * @thread  The emulation thread.
  */
-VMMDECL(void) TMTimerPollVoid(PVM pVM, PVMCPU pVCpu)
+VMM_INT_DECL(void) TMTimerPollVoid(PVM pVM, PVMCPU pVCpu)
 {
     uint64_t off;
@@ -700,5 +700,5 @@
  * @thread  The emulation thread.
  */
-VMMDECL(uint64_t) TMTimerPollGIP(PVM pVM, PVMCPU pVCpu, uint64_t *pu64Delta)
+VMM_INT_DECL(uint64_t) TMTimerPollGIP(PVM pVM, PVMCPU pVCpu, uint64_t *pu64Delta)
 {
     return tmTimerPollInternal(pVM, pVCpu, pu64Delta);
Index: /trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp	(revision 22807)
+++ /trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp	(revision 22808)
@@ -109,5 +109,5 @@
  * @thread EMT.
  */
-VMMDECL(bool) TMCpuTickCanUseRealTSC(PVMCPU pVCpu, uint64_t *poffRealTSC)
+VMM_INT_DECL(bool) TMCpuTickCanUseRealTSC(PVMCPU pVCpu, uint64_t *poffRealTSC)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -243,5 +243,5 @@
  * @param   pVCpu       The VMCPU to operate on.
  */
-VMMDECL(uint64_t) TMCpuTickGetNoCheck(PVMCPU pVCpu)
+VMM_INT_DECL(uint64_t) TMCpuTickGetNoCheck(PVMCPU pVCpu)
 {
     return tmCpuTickGetInternal(pVCpu, false /* fCheckTimers */);
@@ -259,5 +259,5 @@
  * @thread  EMT which TSC is to be set.
  */
-VMMDECL(int) TMCpuTickSet(PVM pVM, PVMCPU pVCpu, uint64_t u64Tick)
+VMM_INT_DECL(int) TMCpuTickSet(PVM pVM, PVMCPU pVCpu, uint64_t u64Tick)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -289,5 +289,5 @@
  * @thread  EMT which TSC is to be set.
  */
-VMMDECL(int) TMCpuTickSetLastSeen(PVMCPU pVCpu, uint64_t u64LastSeenTick)
+VMM_INT_DECL(int) TMCpuTickSetLastSeen(PVMCPU pVCpu, uint64_t u64LastSeenTick)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -307,5 +307,5 @@
  * @thread  EMT which TSC is to be set.
  */
-VMMDECL(uint64_t) TMCpuTickGetLastSeen(PVMCPU pVCpu)
+VMM_INT_DECL(uint64_t) TMCpuTickGetLastSeen(PVMCPU pVCpu)
 {
     VMCPU_ASSERT_EMT(pVCpu);
Index: /trunk/src/VBox/VMM/VMMAll/TMAllReal.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/TMAllReal.cpp	(revision 22807)
+++ /trunk/src/VBox/VMM/VMMAll/TMAllReal.cpp	(revision 22808)
@@ -37,5 +37,5 @@
  * @param   pVM             The VM handle.
  */
-VMMDECL(uint64_t) TMRealGet(PVM pVM)
+VMM_INT_DECL(uint64_t) TMRealGet(PVM pVM)
 {
     return RTTimeMilliTS();
@@ -49,5 +49,5 @@
  * @param   pVM             The VM handle.
  */
-VMMDECL(uint64_t) TMRealGetFreq(PVM pVM)
+VMM_INT_DECL(uint64_t) TMRealGetFreq(PVM pVM)
 {
     return TMCLOCK_FREQ_REAL;
Index: /trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp	(revision 22807)
+++ /trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp	(revision 22808)
@@ -370,5 +370,5 @@
  *          makes use of TSC and kernel timers.
  */
-VMMDECL(uint64_t) TMVirtualGet(PVM pVM)
+VMM_INT_DECL(uint64_t) TMVirtualGet(PVM pVM)
 {
     return tmVirtualGet(pVM, true /* check timers */);
@@ -387,5 +387,5 @@
  * @remarks See TMVirtualGet.
  */
-VMMDECL(uint64_t) TMVirtualGetNoCheck(PVM pVM)
+VMM_INT_DECL(uint64_t) TMVirtualGetNoCheck(PVM pVM)
 {
     return tmVirtualGet(pVM, false /*fCheckTimers*/);
@@ -745,5 +745,5 @@
  * @remarks May set the timer and virtual sync FFs.
  */
-VMMDECL(uint64_t) TMVirtualSyncGet(PVM pVM)
+VMM_INT_DECL(uint64_t) TMVirtualSyncGet(PVM pVM)
 {
     return tmVirtualSyncGetEx(pVM, true /* check timers */);
@@ -760,5 +760,5 @@
  * @remarks May set the timer and virtual sync FFs.
  */
-VMMDECL(uint64_t) TMVirtualSyncGetNoCheck(PVM pVM)
+VMM_INT_DECL(uint64_t) TMVirtualSyncGetNoCheck(PVM pVM)
 {
     return tmVirtualSyncGetEx(pVM, false /* check timers */);
@@ -775,5 +775,5 @@
  * @remarks May set the timer and virtual sync FFs.
  */
-VMMDECL(uint64_t) TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers)
+VMM_INT_DECL(uint64_t) TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers)
 {
     return tmVirtualSyncGetEx(pVM, fCheckTimers);
@@ -787,5 +787,5 @@
  * @param   pVM     VM handle.
  */
-VMMDECL(uint64_t) TMVirtualSyncGetLag(PVM pVM)
+VMM_INT_DECL(uint64_t) TMVirtualSyncGetLag(PVM pVM)
 {
     return pVM->tm.s.offVirtualSync - pVM->tm.s.offVirtualSyncGivenUp;
@@ -799,5 +799,5 @@
  * @param   pVM     VM handle.
  */
-VMMDECL(uint32_t) TMVirtualSyncGetCatchUpPct(PVM pVM)
+VMM_INT_DECL(uint32_t) TMVirtualSyncGetCatchUpPct(PVM pVM)
 {
     if (pVM->tm.s.fVirtualSyncCatchUp)
@@ -813,5 +813,5 @@
  * @param   pVM     VM handle.
  */
-VMMDECL(uint64_t) TMVirtualGetFreq(PVM pVM)
+VMM_INT_DECL(uint64_t) TMVirtualGetFreq(PVM pVM)
 {
     return TMCLOCK_FREQ_VIRTUAL;
@@ -870,5 +870,5 @@
  *          without any adjustments.
  */
-VMMDECL(uint64_t) TMVirtualToNano(PVM pVM, uint64_t u64VirtualTicks)
+VMM_INT_DECL(uint64_t) TMVirtualToNano(PVM pVM, uint64_t u64VirtualTicks)
 {
     AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
@@ -886,5 +886,5 @@
  *          without any adjustments.
  */
-VMMDECL(uint64_t) TMVirtualToMicro(PVM pVM, uint64_t u64VirtualTicks)
+VMM_INT_DECL(uint64_t) TMVirtualToMicro(PVM pVM, uint64_t u64VirtualTicks)
 {
     AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
@@ -902,5 +902,5 @@
  *          without any adjustments.
  */
-VMMDECL(uint64_t) TMVirtualToMilli(PVM pVM, uint64_t u64VirtualTicks)
+VMM_INT_DECL(uint64_t) TMVirtualToMilli(PVM pVM, uint64_t u64VirtualTicks)
 {
         AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
@@ -917,5 +917,5 @@
  * @remark  There could be rounding and overflow errors here.
  */
-VMMDECL(uint64_t) TMVirtualFromNano(PVM pVM, uint64_t u64NanoTS)
+VMM_INT_DECL(uint64_t) TMVirtualFromNano(PVM pVM, uint64_t u64NanoTS)
 {
     AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
@@ -932,5 +932,5 @@
  * @remark  There could be rounding and overflow errors here.
  */
-VMMDECL(uint64_t) TMVirtualFromMicro(PVM pVM, uint64_t u64MicroTS)
+VMM_INT_DECL(uint64_t) TMVirtualFromMicro(PVM pVM, uint64_t u64MicroTS)
 {
     AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);
@@ -947,5 +947,5 @@
  * @remark  There could be rounding and overflow errors here.
  */
-VMMDECL(uint64_t) TMVirtualFromMilli(PVM pVM, uint64_t u64MilliTS)
+VMM_INT_DECL(uint64_t) TMVirtualFromMilli(PVM pVM, uint64_t u64MilliTS)
 {
     AssertCompile(TMCLOCK_FREQ_VIRTUAL == 1000000000);