Changeset 34322 in vbox for trunk

Timestamp:

Nov 24, 2010 1:36:24 PM (14 years ago)

Author:

vboxsync

Message:

VMM: Changed a bunch of VMMR3DECLs to VMMR3_INT_DECL.

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (18 diffs)
• VMMSwitcher.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -121 +121 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) VMMR3Init(PVM pVM)
+VMMR3_INT_DECL(int) VMMR3Init(PVM pVM)
 {
     LogFlow(("VMMR3Init\n"));
@@ -465 +465 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) VMMR3InitR0(PVM pVM)
+VMMR3_INT_DECL(int) VMMR3InitR0(PVM pVM)
 {
     int    rc;
@@ -527 +527 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) VMMR3InitRC(PVM pVM)
+VMMR3_INT_DECL(int) VMMR3InitRC(PVM pVM)
 {
     PVMCPU pVCpu = VMMGetCpu(pVM);
@@ -689 +689 @@
  * @param   pVM         The VM handle.
  */
-VMMR3DECL(int) VMMR3Term(PVM pVM)
+VMMR3_INT_DECL(int) VMMR3Term(PVM pVM)
 {
     PVMCPU pVCpu = VMMGetCpu(pVM);
@@ -771 +771 @@
  * @param   pVM         The VM to operate on.
  */
-VMMR3DECL(int) VMMR3TermCPU(PVM pVM)
+VMMR3_INT_DECL(int) VMMR3TermCPU(PVM pVM)
 {
     return VINF_SUCCESS;
@@ -787 +787 @@
  * @param   offDelta    The relocation delta.
  */
-VMMR3DECL(void) VMMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
+VMMR3_INT_DECL(void) VMMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
 {
     LogFlow(("VMMR3Relocate: offDelta=%RGv\n", offDelta));
@@ -838 +838 @@
  * @param   pVM     The VM handle.
  */
-VMMR3DECL(int)  VMMR3UpdateLoggers(PVM pVM)
+VMMR3_INT_DECL(int) VMMR3UpdateLoggers(PVM pVM)
 {
     /*
@@ -1075 +1075 @@
  * @remark  This has to work before VMMR3Relocate() is called.
  */
-VMMR3DECL(int) VMMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue)
+VMMR3_INT_DECL(int) VMMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
     if (!strcmp(pszSymbol, "g_Logger"))
@@ -1104 +1104 @@
  * @param   pVM             The VM handle.
  */
-VMMR3DECL(void) VMMR3YieldSuspend(PVM pVM)
+VMMR3_INT_DECL(void) VMMR3YieldSuspend(PVM pVM)
 {
     VMCPU_ASSERT_EMT(&pVM->aCpus[0]);
@@ -1126 +1126 @@
  * @param   pVM             The VM handle.
  */
-VMMR3DECL(void) VMMR3YieldStop(PVM pVM)
+VMMR3_INT_DECL(void) VMMR3YieldStop(PVM pVM)
 {
     if (!pVM->vmm.s.cYieldResumeMillies)
@@ -1140 +1140 @@
  * @param   pVM             The VM handle.
  */
-VMMR3DECL(void) VMMR3YieldResume(PVM pVM)
+VMMR3_INT_DECL(void) VMMR3YieldResume(PVM pVM)
 {
     if (pVM->vmm.s.cYieldResumeMillies)
@@ -1196 +1196 @@
  * @param   pVCpu       The VMCPU to operate on.
  */
-VMMR3DECL(int) VMMR3RawRunGC(PVM pVM, PVMCPU pVCpu)
+VMMR3_INT_DECL(int) VMMR3RawRunGC(PVM pVM, PVMCPU pVCpu)
 {
     Log2(("VMMR3RawRunGC: (cs:eip=%04x:%08x)\n", CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
@@ -1265 +1265 @@
  * @param   pVCpu       The VMCPU to operate on.
  */
-VMMR3DECL(int) VMMR3HwAccRunGC(PVM pVM, PVMCPU pVCpu)
+VMMR3_INT_DECL(int) VMMR3HwAccRunGC(PVM pVM, PVMCPU pVCpu)
 {
     Log2(("VMMR3HwAccRunGC: (cs:eip=%04x:%08x)\n", CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
@@ -1362 +1362 @@
  * @param   uVector     SIPI vector
  */
-VMMR3DECL(void) VMMR3SendSipi(PVM pVM, VMCPUID idCpu,  uint32_t uVector)
+VMMR3_INT_DECL(void) VMMR3SendSipi(PVM pVM, VMCPUID idCpu,  uint32_t uVector)
 {
     AssertReturnVoid(idCpu < pVM->cCpus);
@@ -1376 +1376 @@
  * @param   idCpu       Virtual CPU to perform int IPI on
  */
-VMMR3DECL(void) VMMR3SendInitIpi(PVM pVM, VMCPUID idCpu)
+VMMR3_INT_DECL(void) VMMR3SendInitIpi(PVM pVM, VMCPUID idCpu)
 {
     AssertReturnVoid(idCpu < pVM->cCpus);
@@ -1441 +1441 @@
  * @param   pvUser      User specified parameter
  *
- * @thread EMT
+ * @thread  EMT
+ * @todo    Remove this if not used again soon.
  */
 VMMR3DECL(int) VMMR3AtomicExecuteHandler(PVM pVM, PFNATOMICHANDLER pfnHandler, void *pvUser)
@@ -1682 +1683 @@
  * @thread  EMT
  */
-VMMR3DECL(int) VMMR3EmtRendezvousFF(PVM pVM, PVMCPU pVCpu)
+VMMR3_INT_DECL(int) VMMR3EmtRendezvousFF(PVM pVM, PVMCPU pVCpu)
 {
     return vmmR3EmtRendezvousCommon(pVM, pVCpu, false /* fIsCaller */, pVM->vmm.s.fRendezvousFlags,
@@ -1834 +1835 @@
  * @param   cbRead          The number of bytes to read.
  */
-VMMR3DECL(int) VMMR3ReadR0Stack(PVM pVM, VMCPUID idCpu, RTHCUINTPTR R0Addr, void *pvBuf, size_t cbRead)
+VMMR3_INT_DECL(int) VMMR3ReadR0Stack(PVM pVM, VMCPUID idCpu, RTHCUINTPTR R0Addr, void *pvBuf, size_t cbRead)
 {
     PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -938 +938 @@
  * @remark  This function may be called before the VMM is initialized.
  */
-VMMR3DECL(int) VMMR3SelectSwitcher(PVM pVM, VMMSWITCHER enmSwitcher)
+VMMR3_INT_DECL(int) VMMR3SelectSwitcher(PVM pVM, VMMSWITCHER enmSwitcher)
 {
     /*
@@ -985 +985 @@
  * @param   pVM             VM handle.
  */
-VMMR3DECL(int) VMMR3DisableSwitcher(PVM pVM)
+VMMR3_INT_DECL(int) VMMR3DisableSwitcher(PVM pVM)
 {
 /** @todo r=bird: I would suggest that we create a dummy switcher which just does something like:
@@ -1006 +1006 @@
  * @param   enmSwitcher     The new switcher.
  */
-VMMR3DECL(RTR0PTR) VMMR3GetHostToGuestSwitcher(PVM pVM, VMMSWITCHER enmSwitcher)
+VMMR3_INT_DECL(RTR0PTR) VMMR3GetHostToGuestSwitcher(PVM pVM, VMMSWITCHER enmSwitcher)
 {
     /*