Changeset 6347

Timestamp:

01/11/08 21:17:34 (11 months ago)

Author:

vboxsync

Message:

VMM: don't overwrite errors

Files:

• trunk/src/VBox/VMM/VM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VM.cpp

@@ -274 +274 @@
-                                AssertMsgFailed(("Add error message for rc=%d (%Vrc)\n", rc, rc));
-                        }
-
+ && !pVM->vm.s.fErrorSet
-                            vmR3CallVMAtError(pfnVMAtError, pvUserVM, rc, RT_SRC_POS, pszError, rc);
-
@@ -2603 +2603 @@
-
-    /*
+     * Prevent overwriting of the previous error.
+     */
+    if (pVM->vm.s.fErrorSet)
+        return;
+
+    pVM->vm.s.fErrorSet = true;
+
+    /*
-     * Make a copy of the message.
-     */

trunk/src/VBox/VMM/VMInternal.h

@@ -238 +238 @@
-    /** List of registered error callbacks. */
-    R3PTRTYPE(PVMATERROR *)         ppAtErrorNext;
+    /** Ignore all but the first error */
+    bool                            fErrorSet;
-
-    /** List of registered error callbacks. */