Changeset 6375 in vbox

Timestamp:

Jan 18, 2008 1:54:23 PM (17 years ago)

Author:

vboxsync

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

27317

Message:

Main: Fixed VM error callback used during powerup so that it doesn't complete the progress object but simply saves the received error message; Fixed Progress::notifyComplete() to not accept the second and subsequent calls (all for #2238).

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (8 diffs)
• ProgressImpl.cpp (modified) (2 diffs)
• glue/ErrorInfo.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -168 +168 @@
 
     const ComObjPtr <Progress> mProgress;
+
+    Utf8Str mErrorMsg;
 };
 
@@ -5329 +5331 @@
  * VM error callback function. Called by the various VM components.
  *
- * @param   pVM         The VM handle. Can be NULL if an error occurred before
- *                          successfully creating a VM.
+ * @param   pVM         VM handle. Can be NULL if an error occurred before
+ *                      successfully creating a VM.
  * @param   pvUser      Pointer to the VMProgressTask structure.
  * @param   rc          VBox status code.
- * @param   pszFormat   The error message.
- * @thread EMT.
+ * @param   pszFormat   Printf-like error message.
+ * @param   args        Various number of argumens for the error message. 
+ * 
+ * @thread EMT, VMPowerUp... 
+ *  
+ * @note The VMProgressTask structure modified by this callback is not thread 
+ *       safe.
  */
 /* static */ DECLCALLBACK (void)
@@ -5346 +5353 @@
     va_list va2;
     va_copy(va2, args); /* Have to make a copy here or GCC will break. */
-    HRESULT hrc = setError (E_FAIL, tr ("%N.\n"
-                                        "VBox status code: %d (%Vrc)"),
-                                    tr (pszFormat), &va2,
-                                    rc, rc);
-    task->mProgress->notifyComplete (hrc);
+    Utf8Str errorMsg = Utf8StrFmt (tr ("%N.\n"
+                                       "VBox status code: %d (%Vrc)"),
+                                   pszFormat, &va2, rc, rc);
     va_end(va2);
+
+    /* For now, this may be called only once. Ignore subsequent calls. */
+    AssertMsgReturnVoid (task->mErrorMsg.isNull(),
+                         ("Cannot set error to '%s': it is already set to '%s'",
+                         errorMsg.raw(), task->mErrorMsg.raw()));
+
+    task->mErrorMsg = errorMsg;
 }
 
@@ -5919 +5931 @@
                 ErrorInfoKeeper eik;
 
-                /*
-                 *  powerDown() will call VMR3Destroy() and do all necessary
-                 *  cleanup (VRDP, USB devices)
-                 */
+                /* powerDown() will call VMR3Destroy() and do all necessary
+                 * cleanup (VRDP, USB devices) */
                 HRESULT hrc2 = console->powerDown();
                 AssertComRC (hrc2);
@@ -5937 +5947 @@
         if (SUCCEEDED (hrc) && VBOX_FAILURE (vrc))
         {
-            /*
-             *  If VMR3Create() or one of the other calls in this function fail,
-             *  an appropriate error message has been already set. However since
-             *  that happens via a callback, the status code in this function is
-             *  not updated.
+            /* If VMR3Create() or one of the other calls in this function fail,
+             * an appropriate error message has been set in task->mErrorMsg.
+             * However since that happens via a callback, the hrc status code in
+             * this function is not updated.
              */
-            if (!task->mProgress->completed())
+            if (task->mErrorMsg.isNull())
             {
-                /*
-                 *  If the COM error info is not yet set but we've got a
-                 *  failure, convert the VBox status code into a meaningful
-                 *  error message. This becomes unused once all the sources of
-                 *  errors set the appropriate error message themselves.
-                 *  Note that we don't use VMSetError() below because pVM is
-                 *  either invalid or NULL here.
+                /* If the error message is not set but we've got a failure,
+                 * convert the VBox status code into a meaningfulerror message.
+                 * This becomes unused once all the sources of errors set the
+                 * appropriate error message themselves.
                  */
                 AssertMsgFailed (("Missing error message during powerup for "
                                   "status code %Vrc\n", vrc));
-                hrc = setError (E_FAIL,
+                task->mErrorMsg = Utf8StrFmt (
                     tr ("Failed to start VM execution (%Vrc)"), vrc);
             }
-            else
-                hrc = task->mProgress->resultCode();
-
-            Assert (FAILED (hrc));
+
+            /* Set the error message as the COM error.
+             * Progress::notifyComplete() will pick it up later. */
+            hrc = setError (E_FAIL, task->mErrorMsg);
             break;
         }
@@ -5970 +5976 @@
         console->mMachineState == MachineState_Restoring)
     {
-        /*
-         *  We are still in the Starting/Restoring state. This means one of:
-         *  1) we failed before VMR3Create() was called;
-         *  2) VMR3Create() failed.
-         *  In both cases, there is no need to call powerDown(), but we still
-         *  need to go back to the PoweredOff/Saved state. Reuse
-         *  vmstateChangeCallback() for that purpose.
+        /* We are still in the Starting/Restoring state. This means one of:
+         * 
+         * 1) we failed before VMR3Create() was called;
+         * 2) VMR3Create() failed.
+         * 
+         * In both cases, there is no need to call powerDown(), but we still
+         * need to go back to the PoweredOff/Saved state. Reuse
+         * vmstateChangeCallback() for that purpose.
          */
 
@@ -5988 +5995 @@
 
     /*
-     *  Evaluate the final result.
-     *  Note that the appropriate mMachineState value is already set by
-     *  vmstateChangeCallback() in all cases.
+     * Evaluate the final result. Note that the appropriate mMachineState value
+     * is already set by vmstateChangeCallback() in all cases.
      */
 
@@ -6003 +6009 @@
     else
     {
-        if (!task->mProgress->completed())
-        {
-            /*  The progress object will fetch the current error info. This
-             *  gets the errors signalled by using setError(). The ones
-             *  signalled via VMSetError() immediately notify the progress
-             *  object that the operation is completed. */
-            task->mProgress->notifyComplete (hrc);
-        }
+        /* The progress object will fetch the current error info */
+        task->mProgress->notifyComplete (hrc);
 
         LogRel (("Power up failed (vrc=%Vrc, hrc=0x%08X)\n", vrc, hrc));

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -747 +747 @@
  *  If the result code indicates a success (|SUCCEEDED (@a aResultCode)|)
  *  then the current operation is set to the last
+ *  
+ *  Note that this method may be called only once for the given Progress object.
+ *  Subsequent calls will assert.
  *
  *  @param aResultCode  Operation result code
@@ -754 +757 @@
     AutoLock lock (this);
     AssertReturn (isReady(), E_FAIL);
+
+    AssertReturn (mCompleted == FALSE, E_FAIL);
 
     mCompleted = TRUE;

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -233 +233 @@
     }
 }
-
-/**
- *  Sets the given error info object for the current thread.  If @a aPreserve
- *  is @c true, then the current error info set on the thread before this
- *  method is called will be preserved in the IVirtualBoxErrorInfo::next
- *  attribute of the new error info object that will be then set as the
- *  current error info object.
- */
-
-//static
-HRESULT setError (IVirtualBoxErrorInfo *aInfo);
 
 // ProgressErrorInfo class