Changeset 6298 in vbox

Timestamp:

Jan 9, 2008 4:21:32 PM (17 years ago)

Author:

vboxsync

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

27163

Message:

When using VMSet.*Error() don't put %Vrc into the error message if the same code is passed to the function. Otherwise the error code is displayed twice in the popping up error box -- looks ugly.

Location:

trunk/src/VBox/VMM

Files:

• MMPagePool.cpp (modified) (1 diff)
• TM.cpp (modified) (12 diffs)
• VM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/MMPagePool.cpp

@@ -313 +313 @@
     if (pPool->fLow)
         VMSetError(pPool->pVM, rc, RT_SRC_POS,
-                   N_("Failed to expand page pool for memory below 4GB. current size: %d pages\n"), 
+                   N_("Failed to expand page pool for memory below 4GB. current size: %d pages"), 
                    pPool->cPages);
     AssertMsgFailed(("Failed to expand pool%s. rc=%Vrc poolsize=%d\n",

trunk/src/VBox/VMM/TM.cpp

@@ -222 +222 @@
         &&  g_pSUPGlobalInfoPage->u32UpdateIntervalNS >= 250000000 /* 0.25s */)
         return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
-                          N_("The GIP update interval is too big. u32UpdateIntervalNS=%RU32 (u32UpdateHz=%RU32)\n"),
+                          N_("The GIP update interval is too big. u32UpdateIntervalNS=%RU32 (u32UpdateHz=%RU32)"),
                           g_pSUPGlobalInfoPage->u32UpdateIntervalNS, g_pSUPGlobalInfoPage->u32UpdateHz);
 
@@ -271 +271 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\""));
 
     /* source */
@@ -279 +279 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\""));
     if (!pVM->tm.s.fTSCUseRealTSC)
         pVM->tm.s.fTSCVirtualized = true;
@@ -307 +307 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying uint64_t value \"TSCTicksPerSecond\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying uint64_t value \"TSCTicksPerSecond\""));
     else if (   pVM->tm.s.cTSCTicksPerSecond < _1M
              || pVM->tm.s.cTSCTicksPerSecond >= _4G)
@@ -336 +336 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying 32-bit integer value \"ScheduleSlack\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying 32-bit integer value \"ScheduleSlack\""));
 
     rc = CFGMR3QueryU64(pCfgHandle, "CatchUpStopThreshold", &pVM->tm.s.u64VirtualSyncCatchUpStopThreshold);
@@ -343 +343 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpStopThreshold\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpStopThreshold\""));
 
     rc = CFGMR3QueryU64(pCfgHandle, "CatchUpGiveUpThreshold", &pVM->tm.s.u64VirtualSyncCatchUpGiveUpThreshold);
@@ -350 +350 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpGiveUpThreshold\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpGiveUpThreshold\""));
 
 
@@ -361 +361 @@
             u64 = UINT64_C(DefStart); \
         else if (VBOX_FAILURE(rc)) \
-            return VMSetError(pVM, rc, RT_SRC_POS, N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpThreshold" #iPeriod "\". (%Vrc)"), rc); \
+            return VMSetError(pVM, rc, RT_SRC_POS, N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpThreshold" #iPeriod "\"")); \
         if (    (iPeriod > 0 && u64 <= pVM->tm.s.aVirtualSyncCatchUpPeriods[iPeriod - 1].u64Start) \
             ||  u64 >= pVM->tm.s.u64VirtualSyncCatchUpGiveUpThreshold) \
@@ -370 +370 @@
             pVM->tm.s.aVirtualSyncCatchUpPeriods[iPeriod].u32Percentage = (DefPct); \
         else if (VBOX_FAILURE(rc)) \
-            return VMSetError(pVM, rc, RT_SRC_POS, N_("Configuration error: Failed to querying 32-bit integer value \"CatchUpPrecentage" #iPeriod "\". (%Vrc)"), rc); \
+            return VMSetError(pVM, rc, RT_SRC_POS, N_("Configuration error: Failed to querying 32-bit integer value \"CatchUpPrecentage" #iPeriod "\"")); \
     } while (0)
     /* This needs more tuning. Not sure if we really need so many period and be so gentle. */
@@ -394 +394 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying 64-bit integer value \"UTCOffset\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying 64-bit integer value \"UTCOffset\""));
 
     /*
@@ -406 +406 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to querying uint32_t value \"WarpDrivePercent\". (%Vrc)"), rc);
+                          N_("Configuration error: Failed to querying uint32_t value \"WarpDrivePercent\""));
     else if (   pVM->tm.s.u32VirtualWarpDrivePercentage < 2
              || pVM->tm.s.u32VirtualWarpDrivePercentage > 20000)
@@ -425 +425 @@
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS,
-                          N_("Configuration error: Failed to query uint32_t value \"TimerMillies\", rc=%Vrc.\n"), rc);
+                          N_("Configuration error: Failed to query uint32_t value \"TimerMillies\""));
     rc = RTTimerCreate(&pVM->tm.s.pTimer, u32Millies, tmR3TimerCallback, pVM);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/VMM/VM.cpp

@@ -270 +270 @@
                                 break;
                             default:
-                                pszError = N_("Unknown error creating VM (%Vrc)");
+                                /* XXX check if there was already an error message set! */
+                                pszError = N_("Unknown error creating VM");
                                 AssertMsgFailed(("Add error message for rc=%d (%Vrc)\n", rc, rc));
                         }
@@ -363 +364 @@
                 break;
             default:
-                pszError = N_("Unknown error initializing kernel driver (%Vrc)");
+                pszError = N_("Unknown error initializing kernel driver");
                 AssertMsgFailed(("Add error message for rc=%d (%Vrc)\n", rc, rc));
         }
@@ -1181 +1182 @@
     {
         vmR3SetState(pVM, VMSTATE_LOAD_FAILURE);
-        rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Unable to restore the virtual machine's saved state from '%s'.  It may be damaged or from an older version of VirtualBox.  Please discard the saved state before starting the virtual machine.  (Error: %Vrc)"), pszFilename, rc);
+        rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Unable to restore the virtual machine's saved state from '%s'.  It may be damaged or from an older version of VirtualBox.  Please discard the saved state before starting the virtual machine"), pszFilename);
     }