Changeset 78923 in vbox for trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

Timestamp:

Jun 3, 2019 9:09:54 AM (6 years ago)

Author:

vboxsync

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

131044

Message:

bugref:9416. Changed the choosing OS type logic for OCI import. Added small private helper function i_setApplianceState(). Moved ApplianceState from Appliance::Data to Appliance.

File:

• trunk/src/VBox/Main/src-server/ApplianceImpl.cpp (modified) (8 diffs)

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

@@ -472 +472 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_isApplianceIdle())
-        return E_ACCESSDENIED;
-
     aPath = m->locInfo.strPath;
 
@@ -488 +485 @@
 
     aDisks.resize(0);
-    if (!i_isApplianceIdle())
-        return E_ACCESSDENIED;
 
     if (m->pReader) // OVFReader instantiated?
@@ -537 +532 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_isApplianceIdle())
-        return E_ACCESSDENIED;
-
     /* Can be NULL at this point, queryInterfaceto handles that. */
     m->ptrCertificateInfo.queryInterfaceTo(aCertificateInfo.asOutParam());
@@ -551 +543 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (!i_isApplianceIdle())
-        return E_ACCESSDENIED;
 
     aVirtualSystemDescriptions.resize(m->virtualSystemDescriptions.size());
@@ -571 +560 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (!i_isApplianceIdle())
-        return E_ACCESSDENIED;
 
     aMachines.resize(m->llGuidsMachinesCreated.size());
@@ -944 +930 @@
 bool Appliance::i_isApplianceIdle()
 {
-    if (m->state == Data::ApplianceImporting)
+    if (m->state == ApplianceImporting)
         setError(VBOX_E_INVALID_OBJECT_STATE, tr("The appliance is busy importing files"));
-    else if (m->state == Data::ApplianceExporting)
+    else if (m->state == ApplianceExporting)
         setError(VBOX_E_INVALID_OBJECT_STATE, tr("The appliance is busy exporting files"));
     else
@@ -1355 +1341 @@
     {
         case TaskCloud::Export:
+            pAppliance->i_setApplianceState(ApplianceExporting);
             pTask->rc = pAppliance->i_exportCloudImpl(pTask);
             break;
         case TaskCloud::Import:
+            pAppliance->i_setApplianceState(ApplianceImporting);
             pTask->rc = pAppliance->i_importCloudImpl(pTask);
             break;
         case TaskCloud::ReadData:
+            pAppliance->i_setApplianceState(ApplianceImporting);
             pTask->rc = pAppliance->i_gettingCloudData(pTask);
             break;
@@ -1368 +1357 @@
             break;
     }
+
+    pAppliance->i_setApplianceState(ApplianceIdle);
 
     if (!pTask->pProgress.isNull())