Changeset 38534 in vbox

Timestamp:

Aug 25, 2011 3:50:21 PM (13 years ago)

Author:

vboxsync

Message:

Main: always use setError; improved some error messages; use the new setError(com::ErrorInfo) method

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImplImport.cpp (modified) (8 diffs)
• MachineImpl.cpp (modified) (1 diff)
• MachineImplCloneVM.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -837 +837 @@
         if (RT_FAILURE(vrc))
         {
-            rc = E_FAIL;
+            rc = setError(VBOX_E_IPRT_ERROR, "Creation of the VD interface failed (%Rrc)", vrc);
             break;
         }
@@ -899 +899 @@
         if (RT_FAILURE(vrc))
         {
-            rc = E_FAIL;
+            rc = setError(VBOX_E_IPRT_ERROR, "Creation of the VD interface failed (%Rrc)", vrc);
             break;
         }
@@ -1238 +1238 @@
         pSha1Io = Sha1CreateInterface();
         if (!pSha1Io)
-            throw E_OUTOFMEMORY;
+            throw setError(E_OUTOFMEMORY);
         pFileIo = FileCreateInterface();
         if (!pFileIo)
-            throw E_OUTOFMEMORY;
+            throw setError(E_OUTOFMEMORY);
 
         SHA1STORAGE storage;
@@ -1250 +1250 @@
                                  &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
-            throw E_FAIL;
+            throw setError(VBOX_E_IPRT_ERROR, "Creation of the VD interface failed (%Rrc)", vrc);
 
         size_t cbMfSize = 0;
@@ -1314 +1314 @@
         pSha1Io = Sha1CreateInterface();
         if (!pSha1Io)
-            throw E_OUTOFMEMORY;
+            throw setError(E_OUTOFMEMORY);
         pTarIo = TarCreateInterface();
         if (!pTarIo)
-            throw E_OUTOFMEMORY;
+            throw setError(E_OUTOFMEMORY);
 
         SHA1STORAGE storage;
@@ -1325 +1325 @@
                              &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
-            throw setError(E_FAIL,
-                           tr("Internal error (%Rrc)"), vrc);
+            throw setError(VBOX_E_IPRT_ERROR,
+                           tr("Creation of the VD interface failed (%Rrc)"), vrc);
 
         /* Read the file name of the first file (need to be the ovf file). This
@@ -1332 +1332 @@
         vrc = RTTarCurrentFile(tar, &pszFilename);
         if (RT_FAILURE(vrc))
-            throw setError(E_FAIL,
-                           tr("Internal error (%Rrc)"), vrc);
+            throw setError(VBOX_E_IPRT_ERROR,
+                           tr("Getting the current file within the archive failed (%Rrc)"), vrc);
         /* Skip the OVF file, cause this was read in IAppliance::Read already. */
         vrc = RTTarSeekNextFile(tar);
         if (   RT_FAILURE(vrc)
             && vrc != VERR_TAR_END_OF_FILE)
-            throw setError(E_FAIL,
-                           tr("Internal error (%Rrc)"), vrc);
+            throw setError(VBOX_E_IPRT_ERROR,
+                           tr("Seeking within the archive failed (%Rrc)"), vrc);
 
         PVDINTERFACEIO pCallbacks = pSha1Io;
@@ -1630 +1630 @@
     }
     else if (vrc != VERR_TAR_END_OF_FILE)
-        rc = E_FAIL;
+        rc = setError(VBOX_E_IPRT_ERROR, "Seeking within the archive failed (%Rrc)", vrc);
 
     return rc;

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -4792 +4792 @@
             rc = pProgress2->COMGETTER(ResultCode)(&iRc);
             if (FAILED(rc)) throw rc;
+            /* If the thread of the progress object has an error, then
+             * retrieve the error info from there, or it'll be lost. */
             if (FAILED(iRc))
-            {
-                /* If the thread of the progress object has an error, then
-                 * retrieve the error info from there, or it'll be lost. */
-                ProgressErrorInfo info(pProgress2);
-                throw setError(iRc, Utf8Str(info.getText()).c_str());
-            }
+                throw setError(ProgressErrorInfo(pProgress2));
         }
         setMachineState(oldState);

trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp

@@ -733 +733 @@
          * IMachine corresponding to a mutable machine as d->pSrcMachine */
         if (d->pSrcMachine->isSessionMachine())
-            throw E_FAIL;
+            throw p->setError(E_INVALIDARG, "The source machine is mutable");
 
         /* Handle the special case that someone is requesting a _full_ clone
@@ -750 +750 @@
             d->pSrcMachine = (Machine*)(IMachine*)newSrcMachine;
         }
-
         bool fSubtreeIncludesCurrent = false;
         ComObjPtr<Machine> pCurrState;
@@ -765 +764 @@
                 if (FAILED(rc)) throw rc;
                 if (pCurr.isNull())
-                    throw E_FAIL;
+                    throw p->setError(VBOX_E_OBJECT_NOT_FOUND);
                 pCurrState = (Machine *)(IMachine *)pCurr;
                 ComPtr<ISnapshot> pSnapshot;
@@ -771 +770 @@
                 if (FAILED(rc)) throw rc;
                 if (pSnapshot.isNull())
-                    throw E_FAIL;
+                    throw p->setError(VBOX_E_OBJECT_NOT_FOUND);
                 ComPtr<IMachine> pCurrSnapMachine;
                 rc = pSnapshot->COMGETTER(Machine)(pCurrSnapMachine.asOutParam());
                 if (FAILED(rc)) throw rc;
                 if (pCurrSnapMachine.isNull())
-                    throw E_FAIL;
+                    throw p->setError(VBOX_E_OBJECT_NOT_FOUND);
 
                 /* now check if there is a parent chain which leads to the
@@ -786 +785 @@
                     if (FAILED(rc)) throw rc;
                     if (pSnapMachine.isNull())
-                        throw E_FAIL;
+                        throw p->setError(VBOX_E_OBJECT_NOT_FOUND);
                     if (pSnapMachine == d->pSrcMachine)
                     {
@@ -840 +839 @@
                     {
                         if (pCurrState.isNull())
-                            throw E_FAIL;
+                            throw p->setError(VBOX_E_OBJECT_NOT_FOUND);
                         machineList.append(pCurrState);
                     }
@@ -1049 +1048 @@
                     ComObjPtr<Medium> pLMedium = static_cast<Medium*>(pTmp);
                     if (pLMedium.isNull())
-                        throw E_POINTER;
+                        throw p->setError(VBOX_E_OBJECT_NOT_FOUND);
                     ComObjPtr<Medium> pBase = pLMedium->getBase();
                     if (pBase->isReadOnly())
@@ -1179 +1178 @@
                         rc = progress2->COMGETTER(ResultCode)(&iRc);
                         if (FAILED(rc)) throw rc;
+                        /* If the thread of the progress object has an error, then
+                         * retrieve the error info from there, or it'll be lost. */
                         if (FAILED(iRc))
-                        {
-                            /* If the thread of the progress object has an error, then
-                             * retrieve the error info from there, or it'll be lost. */
-                            ProgressErrorInfo info(progress2);
-                            throw p->setError(iRc, Utf8Str(info.getText()).c_str());
-                        }
+                            throw p->setError(ProgressErrorInfo(progress2));
                         /* Remember created medium. */
                         newMedia.append(pTarget);
@@ -1229 +1225 @@
                 ComObjPtr<Medium> pLMedium = static_cast<Medium*>((IMedium*)mt.pMedium);
                 if (pLMedium.isNull())
-                    throw E_POINTER;
+                    throw p->setError(E_POINTER, "Returned object is empty");
                 ComObjPtr<Medium> pBase = pLMedium->getBase();
                 if (pBase->isReadOnly())