Changeset 24508 in vbox for trunk/src

Timestamp:

Nov 9, 2009 2:44:12 PM (15 years ago)

Author:

vboxsync

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

54602

Message:

SSM,VM: VMSetError handling.

Location:

trunk/src/VBox/VMM

Files:

• SSM.cpp (modified) (2 diffs)
• VM.cpp (modified) (6 diffs)
• VMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/SSM.cpp

@@ -7649 +7649 @@
                                     pszName, UnitHdr.u32Instance, UnitHdr.u32Version));
                             if (!ASMAtomicXchgBool(&pSSM->u.Read.fHaveSetError, true))
-                                VMSetError(pVM, rc, RT_SRC_POS, N_("Load exec failed for '%s' instance #%u (version %u)"),
-                                           pszName, UnitHdr.u32Instance, UnitHdr.u32Version);
+                                if (rc == VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION)
+                                    VMSetError(pVM, rc, RT_SRC_POS, N_("Unsupported version %u of data unit '%s' (instance #%u)"),
+                                               UnitHdr.u32Version, UnitHdr.szName, UnitHdr.u32Instance);
+                                else
+                                    VMSetError(pVM, rc, RT_SRC_POS, N_("Load exec failed for '%s' instance #%u (version %u)"),
+                                               pszName, UnitHdr.u32Instance, UnitHdr.u32Version);
                             break;
                         }
@@ -7910 +7914 @@
                         UnitHdr.szName, UnitHdr.u32Instance, UnitHdr.u32Version, UnitHdr.u32Pass, rc));
                 if (!ASMAtomicXchgBool(&pSSM->u.Read.fHaveSetError, true))
-                    rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Failed to load unit '%s'"), UnitHdr.szName);
+                    if (rc == VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION)
+                        rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Unsupported version %u of data unit '%s' (instance #%u, pass %#x)"),
+                                        UnitHdr.u32Version, UnitHdr.szName, UnitHdr.u32Instance, UnitHdr.u32Pass);
+                    else
+                        rc = VMSetError(pVM, rc, RT_SRC_POS, N_("Failed to load unit '%s'"), UnitHdr.szName);
                 return rc;
             }

trunk/src/VBox/VMM/VM.cpp

@@ -1846 +1846 @@
     pVM->vm.s.fTeleportedAndNotFullyResumedYet = fTeleporting;
 
+    uint32_t cErrorsPriorToSave = VMR3GetErrorCount(pVM);
     rc = SSMR3Load(pVM, pszFilename, pStreamOps, pvStreamOpsUser, SSMAFTER_RESUME, pfnProgress, pvProgressUser);
     if (RT_SUCCESS(rc))
@@ -1856 +1857 @@
         pVM->vm.s.fTeleportedAndNotFullyResumedYet = false;
         vmR3SetState(pVM, VMSTATE_LOAD_FAILURE, VMSTATE_LOADING);
-        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);
+        if (cErrorsPriorToSave == VMR3GetErrorCount(pVM))
+            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);
     }
 
@@ -3520 +3524 @@
     PUVM pUVM = pVM->pUVM;
     RTCritSectEnter(&pUVM->vm.s.AtErrorCritSect);
+    ASMAtomicIncU32(&pUVM->vm.s.cRuntimeErrors);
     for (PVMATERROR pCur = pUVM->vm.s.pAtError; pCur; pCur = pCur->pNext)
         vmR3SetErrorWorkerDoCall(pVM, pCur, rc, RT_SRC_POS_ARGS, "%s", pszMessage);
     RTCritSectLeave(&pUVM->vm.s.AtErrorCritSect);
+}
+
+
+/**
+ * Gets the number of errors raised via VMSetError.
+ *
+ * This can be used avoid double error messages.
+ *
+ * @returns The error count.
+ * @param   pVM             The VM handle.
+ */
+VMMR3DECL(uint32_t) VMR3GetErrorCount(PVM pVM)
+{
+    return pVM->pUVM->vm.s.cErrors;
 }
 
@@ -3580 +3599 @@
     bool fCalledSomeone = false;
     RTCritSectEnter(&pUVM->vm.s.AtErrorCritSect);
+    ASMAtomicIncU32(&pUVM->vm.s.cErrors);
     for (PVMATERROR pCur = pUVM->vm.s.pAtError; pCur; pCur = pCur->pNext)
     {
@@ -3773 +3793 @@
     PUVM pUVM = pVM->pUVM;
     RTCritSectEnter(&pUVM->vm.s.AtErrorCritSect);
+    ASMAtomicIncU32(&pUVM->vm.s.cRuntimeErrors);
     for (PVMATRUNTIMEERROR pCur = pUVM->vm.s.pAtRuntimeError; pCur; pCur = pCur->pNext)
     {
@@ -3902 +3923 @@
 
 /**
+ * Gets the number of runtime errors raised via VMR3SetRuntimeError.
+ *
+ * This can be used avoid double error messages.
+ *
+ * @returns The runtime error count.
+ * @param   pVM             The VM handle.
+ */
+VMMR3DECL(uint32_t) VMR3GetRuntimeErrorCount(PVM pVM)
+{
+    return pVM->pUVM->vm.s.cRuntimeErrors;
+}
+
+
+/**
  * Gets the ID virtual of the virtual CPU assoicated with the calling thread.
  *

trunk/src/VBox/VMM/VMInternal.h

@@ -228 +228 @@
     /** List of registered error callbacks. */
     PVMATERROR                     *ppAtErrorNext;
-
+    /** The error message count.
+     * This is incremented every time an error is raised.  */
+    uint32_t volatile               cErrors;
+
+    /** The runtime error message count.
+     * This is incremented every time a runtime error is raised.  */
+    uint32_t volatile               cRuntimeErrors;
     /** List of registered error callbacks. */
     PVMATRUNTIMEERROR               pAtRuntimeError;