Changeset 18113 in vbox for trunk/src

Timestamp:

Mar 20, 2009 12:54:04 PM (16 years ago)

Author:

vboxsync

Message:

don't spam the release log if Guest::GetStatistic() fails

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1652 +1652 @@
 
             rc = guest->GetStatistic(0, GuestStatisticType_SampleNumber, &statVal);
-            if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("StatGuestSample=%d\n", statVal);
-            else
-                RTPrintf("Guest statistics for sample %d:\n\n", statVal);
+            if (SUCCEEDED(rc))
+            {
+                if (details == VMINFO_MACHINEREADABLE)
+                    RTPrintf("StatGuestSample=%d\n", statVal);
+                else
+                    RTPrintf("Guest statistics for sample %d:\n\n", statVal);
+            }
 
             rc = guest->GetStatistic(0, GuestStatisticType_CPULoad_Idle, &statVal);

trunk/src/VBox/Main/GuestImpl.cpp

@@ -292 +292 @@
     CheckComArgOutPointerValid(aStatVal);
 
-    /* not available or not yet reported? */
-    CheckComArgExpr(aStatistic, mCurrentGuestStat[aStatistic] != GUEST_STAT_INVALID);
+    /* Not available or not yet reported? In that case, just return with a proper error
+     * but don't use setError(). */
+    if (mCurrentGuestStat[aStatistic] == GUEST_STAT_INVALID)
+        return E_INVALIDARG;
 
     *aStatVal = mCurrentGuestStat[aStatistic];