Changeset 21926 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 2, 2009 3:47:18 PM (16 years ago)

Author:

vboxsync

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

50593

Message:

SSM: Added some VMSetError in the most common load failure paths.

File:

• trunk/src/VBox/VMM/SSM-new.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/SSM-new.cpp

@@ -3530 +3530 @@
                             {
                                 LogRel(("SSM: Unit '%s' read %lld bytes too much!\n", pszName, i64Diff));
+                                VMSetError(pVM, rc, RT_SRC_POS, N_("Unit '%s' read %lld bytes too much"), pszName, i64Diff);
                                 rc = VERR_SSM_INTEGRITY;
                                 break;
@@ -3540 +3541 @@
                             LogRel(("SSM: Load exec failed for '%s' instance #%u ! (version %u)\n",
                                     pszName, UnitHdr.u32Instance, UnitHdr.u32Version));
+                            VMSetError(pVM, rc, RT_SRC_POS, N_("Load exec failed for '%s' instance #%u (version %u)"),
+                                       pszName, UnitHdr.u32Instance, UnitHdr.u32Version);
                             rc = VERR_SSM_INTEGRITY;
                             break;
@@ -3602 +3605 @@
             LogRel(("SSM: Unit at %#llx (%lld): Invalid unit magic: %.*Rhxs!\n",
                     offUnit, offUnit, sizeof(UnitHdr.szMagic) - 1, &UnitHdr.szMagic[0]));
-            return VERR_SSM_INTEGRITY_UNIT_MAGIC;
+            return VMSetError(pVM, VERR_SSM_INTEGRITY_UNIT_MAGIC, RT_SRC_POS,
+                              N_("Unit at %#llx (%lld): Invalid unit magic"), offUnit, offUnit);
         }
         if (UnitHdr.cbName)
@@ -3689 +3693 @@
             else
             {
-                LogRel(("SSM: LoadExec failed for '%s' instance #%u (version %u): %Rrc\n",
+                LogRel(("SSM: LoadExec failed for '%s' instance #%u (version %u, phase %#x): %Rrc\n",
                         UnitHdr.szName, UnitHdr.u32Instance, UnitHdr.u32Version, UnitHdr.u32Phase, rc));
-                return rc;
+                return VMSetError(pVM, rc, RT_SRC_POS, N_("Failed to load unit '%s'"), UnitHdr.szName);
             }
         }
@@ -3701 +3705 @@
             LogRel(("SSM: Found no handler for unit '%s' instance #%u!\n", UnitHdr.szName, UnitHdr.u32Instance));
             //if (pSSM->enmAfter != SSMAFTER_DEBUG_IT)
-                return VERR_SSM_INTEGRITY_UNIT_NOT_FOUND;
+                return VMSetError(pVM, VERR_SSM_INTEGRITY_UNIT_NOT_FOUND, RT_SRC_POS,
+                                  N_("Found no handler for unit '%s' instance #%u"), UnitHdr.szName, UnitHdr.u32Instance);
             /** @todo Read data unit to /dev/null. */
         }