Changeset 59590 in vbox for trunk

Timestamp:

Feb 4, 2016 6:58:16 PM (9 years ago)

Author:

vboxsync

Message:

Appliance::i_taskThreadImportOrExport: wrong status codes for unsupported stuff (IPRT and S_OK).

File:

• trunk/src/VBox/Main/src-server/ApplianceImpl.cpp (modified) (1 diff)

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

@@ -1197 +1197 @@
 DECLCALLBACK(int) Appliance::i_taskThreadImportOrExport(RTTHREAD /* aThread */, void *pvUser)
 {
-    TaskOVF* task = static_cast<TaskOVF*>(pvUser);
-    AssertReturn(task, VERR_GENERAL_FAILURE);
-
-    Appliance *pAppliance = task->pAppliance;
+    TaskOVF *pTask = static_cast<TaskOVF*>(pvUser);
+    AssertReturn(pTask, VERR_GENERAL_FAILURE);
+
+    Appliance *pAppliance = pTask->pAppliance;
 
     LogFlowFuncEnter();
-    LogFlowFunc(("Appliance %p taskType=%d\n", pAppliance, task->taskType));
-
-    HRESULT taskrc = S_OK;
-
-    switch (task->taskType)
+    LogFlowFunc(("Appliance %p taskType=%d\n", pAppliance, pTask->taskType));
+
+    switch (pTask->taskType)
     {
         case TaskOVF::Read:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->i_readFS(task);
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = VERR_NOT_IMPLEMENTED;
-        break;
+            if (pTask->locInfo.storageType == VFSType_File)
+                pTask->rc = pAppliance->i_readFS(pTask);
+            else
+                pTask->rc = E_NOTIMPL;
+            break;
 
         case TaskOVF::Import:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->i_importFS(task);
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = VERR_NOT_IMPLEMENTED;
-        break;
+            if (pTask->locInfo.storageType == VFSType_File)
+                pTask->rc = pAppliance->i_importFS(pTask);
+            else
+                pTask->rc = E_NOTIMPL;
+            break;
 
         case TaskOVF::Write:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->i_writeFS(task);
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = VERR_NOT_IMPLEMENTED;
-        break;
-    }
-
-    task->rc = taskrc;
-
-    if (!task->pProgress.isNull())
-        task->pProgress->i_notifyComplete(taskrc);
+            if (pTask->locInfo.storageType == VFSType_File)
+                pTask->rc = pAppliance->i_writeFS(pTask);
+            else
+                pTask->rc = E_NOTIMPL;
+            break;
+
+        default:
+            AssertFailed();
+            pTask->rc = E_FAIL;
+            break;
+    }
+
+    if (!pTask->pProgress.isNull())
+        pTask->pProgress->i_notifyComplete(pTask->rc);
 
     LogFlowFuncLeave();