Changeset 13816 in vbox for trunk/src/VBox/VMM/VMMGC

Timestamp:

Nov 4, 2008 10:52:12 PM (16 years ago)

Author:

vboxsync

Message:

VMM: VBOX_SUCCESS -> RT_SUCCESS, VBOX_FAILURE -> RT_FAILURE.

Location:

trunk/src/VBox/VMM/VMMGC

Files:

• MMRamGC.cpp (modified) (2 diffs)
• SELMGC.cpp (modified) (7 diffs)
• TRPMGC.cpp (modified) (1 diff)
• TRPMGCHandlers.cpp (modified) (7 diffs)
• VMMGC.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMGC/MMRamGC.cpp

@@ -109 +109 @@
     rc = MMGCRamReadNoTrapHandler(pDst, pSrc, cb);
     MMGCRamDeregisterTrapHandler(pVM);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         TRPMRestoreTrap(pVM);
 
@@ -132 +132 @@
     int rc = MMGCRamWriteNoTrapHandler(pDst, pSrc, cb);
     MMGCRamDeregisterTrapHandler(pVM);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         TRPMRestoreTrap(pVM);
 

trunk/src/VBox/VMM/VMMGC/SELMGC.cpp

@@ -66 +66 @@
     X86DESC Desc;
     int rc = MMGCRamRead(pVM, &Desc, (uint8_t *)GdtrGuest.pGdt + offEntry, sizeof(X86DESC));
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT;
 
@@ -201 +201 @@
         uint32_t cb;
         rc = EMInterpretInstruction(pVM, pRegFrame, (RTGCPTR)(RTRCUINTPTR)pvFault, &cb);
-        if (VBOX_SUCCESS(rc) && cb)
+        if (RT_SUCCESS(rc) && cb)
         {
             unsigned iGDTE1 = offRange / sizeof(X86DESC);
@@ -217 +217 @@
                 }
             }
-            if (rc == VINF_SUCCESS || VBOX_FAILURE(rc2))
+            if (rc == VINF_SUCCESS || RT_FAILURE(rc2))
                 rc = rc2;
         }
         else
         {
-            Assert(VBOX_FAILURE(rc));
+            Assert(RT_FAILURE(rc));
             if (rc == VERR_EM_INTERPRETER)
                 rc = VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT;
@@ -287 +287 @@
     uint32_t cb;
     int rc = EMInterpretInstruction(pVM, pRegFrame, (RTGCPTR)(RTRCUINTPTR)pvFault, &cb);
-    if (VBOX_SUCCESS(rc) && cb)
+    if (RT_SUCCESS(rc) && cb)
     {
         PCVBOXTSS pGuestTSS = (PVBOXTSS)pVM->selm.s.GCPtrGuestTss;
@@ -313 +313 @@
                 {
                     rc = MMGCRamRead(pVM, &pVM->selm.s.Tss.IntRedirBitmap[i * 8], (uint8_t *)pGuestTSS + offIntRedirBitmap + i * 8, 8);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         /* Shadow page table might be out of sync */
                         rc = PGMPrefetchPage(pVM, (RTGCPTR)(RTRCUINTPTR)((uint8_t *)pGuestTSS + offIntRedirBitmap + i*8));
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                         {
                             AssertMsg(rc == VINF_SUCCESS, ("PGMPrefetchPage %VGv failed with %Vrc\n", (uint8_t *)pGuestTSS + offIntRedirBitmap + i*8, rc));
@@ -333 +333 @@
     else
     {
-        Assert(VBOX_FAILURE(rc));
+        Assert(RT_FAILURE(rc));
         VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
         STAM_COUNTER_INC(&pVM->selm.s.StatRCWriteGuestTSSUnhandled);
@@ -427 +427 @@
 #endif
 
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             if (!fTriedAlready)

trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

@@ -126 +126 @@
         uint32_t cb;
         int rc = EMInterpretInstruction(pVM, pRegFrame, pvFault, &cb);
-        if (VBOX_SUCCESS(rc) && cb)
+        if (RT_SUCCESS(rc) && cb)
         {
             uint32_t iGate1 = (offRange + cb - 1)/sizeof(VBOXIDTE);

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -359 +359 @@
         RTGCPTR PC;
         rc = SELMValidateAndConvertCSAddr(pVM, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip, &PC);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             Log(("TRPMGCTrap06Handler: Failed to convert %RTsel:%RX32 (cpl=%d) - rc=%Vrc !!\n", pRegFrame->cs, pRegFrame->eip, pRegFrame->ss & X86_SEL_RPL, rc));
@@ -368 +368 @@
         uint32_t    cbOp;
         rc = EMInterpretDisasOneEx(pVM, (RTGCUINTPTR)PC, pRegFrame, &Cpu, &cbOp);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return trpmGCExitTrap(pVM, VINF_EM_RAW_EMULATE_INSTR, pRegFrame);
 
@@ -406 +406 @@
             uint32_t cbIgnored;
             rc = EMInterpretInstructionCPU(pVM, &Cpu, pRegFrame, PC, &cbIgnored);
-            if (RT_LIKELY(VBOX_SUCCESS(rc)))
+            if (RT_LIKELY(RT_SUCCESS(rc)))
                 pRegFrame->eip += Cpu.opsize;
         }
@@ -583 +583 @@
             }
             rc = TRPMForwardTrap(pVM, pRegFrame, (uint32_t)pCpu->param1.parval, pCpu->opsize, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT, 0xd);
-            if (VBOX_SUCCESS(rc) && rc != VINF_EM_RAW_GUEST_TRAP)
+            if (RT_SUCCESS(rc) && rc != VINF_EM_RAW_GUEST_TRAP)
                 return trpmGCExitTrap(pVM, VINF_SUCCESS, pRegFrame);
 
@@ -627 +627 @@
             uint32_t cbIgnored;
             rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
                 pRegFrame->eip += pCpu->opsize;
             else if (rc == VERR_EM_INTERPRETER)
@@ -674 +674 @@
             Assert(pCpu->param1.flags & USE_IMMEDIATE8);
             rc = TRPMForwardTrap(pVM, pRegFrame, (uint32_t)pCpu->param1.parval, pCpu->opsize, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT, 0xd);
-            if (VBOX_SUCCESS(rc) && rc != VINF_EM_RAW_GUEST_TRAP)
+            if (RT_SUCCESS(rc) && rc != VINF_EM_RAW_GUEST_TRAP)
                 return trpmGCExitTrap(pVM, VINF_SUCCESS, pRegFrame);
 
@@ -705 +705 @@
             uint32_t cbIgnored;
             rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
                 pRegFrame->eip += pCpu->opsize;
             else if (rc == VERR_EM_INTERPRETER)

trunk/src/VBox/VMM/VMMGC/VMMGC.cpp

@@ -301 +301 @@
                  */
                 rc = TRPMGCSetTempHandler(pVM, X86_XCPT_PF, uArg != 4 ? vmmGCTestTmpPFHandler : vmmGCTestTmpPFHandlerCorruptFS);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     rc = vmmGCTestTrap0e();
@@ -307 +307 @@
                     /* in case it didn't fire. */
                     int rc2 = TRPMGCSetTempHandler(pVM, X86_XCPT_PF, NULL);
-                    if (VBOX_FAILURE(rc2) && VBOX_SUCCESS(rc))
+                    if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
                         rc = rc2;
                 }
@@ -329 +329 @@
  *
  * @returns VBox status code (appropriate for GC return).
- *          In this context VBOX_SUCCESS means to restart the instruction.
+ *          In this context RT_SUCCESS means to restart the instruction.
  * @param   pVM         VM handle.
  * @param   pRegFrame   Trap register frame.
@@ -348 +348 @@
  *
  * @returns VBox status code (appropriate for GC return).
- *          In this context VBOX_SUCCESS means to restart the instruction.
+ *          In this context RT_SUCCESS means to restart the instruction.
  * @param   pVM         VM handle.
  * @param   pRegFrame   Trap register frame.