Changeset 27796 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Mar 29, 2010 4:04:55 PM (15 years ago)

Author:

vboxsync

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

59453

Message:

Main: attempt at USB locking fixes

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (11 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -748 +748 @@
 {
     TaskOVF(Appliance *aThat)
-      : pAppliance(aThat)
-      , rc(S_OK) {}
+      : pAppliance(aThat),
+        rc(S_OK)
+    {}
 
     static int updateProgress(unsigned uPercent, void *pvUser);
@@ -759 +760 @@
 };
 
-struct Appliance::TaskImportOVF: Appliance::TaskOVF
+struct Appliance::TaskImportOVF : Appliance::TaskOVF
 {
     enum TaskType
@@ -768 +769 @@
 
     TaskImportOVF(Appliance *aThat)
-        : TaskOVF(aThat)
-        , taskType(Read) {}
+        : TaskOVF(aThat),
+          taskType(Read)
+    {}
 
     int startThread();
@@ -776 +778 @@
 };
 
-struct Appliance::TaskExportOVF: Appliance::TaskOVF
+struct Appliance::TaskExportOVF : Appliance::TaskOVF
 {
     enum OVFFormat
@@ -790 +792 @@
 
     TaskExportOVF(Appliance *aThat)
-        : TaskOVF(aThat)
-        , taskType(Write) {}
+        : TaskOVF(aThat),
+          taskType(Write)
+    {}
 
     int startThread();
@@ -813 +816 @@
     Appliance::TaskOVF* pTask = *(Appliance::TaskOVF**)pvUser;
 
-    if (pTask &&
-        !pTask->progress.isNull())
+    if (    pTask
+         && !pTask->progress.isNull())
     {
         BOOL fCanceled;
@@ -871 +874 @@
 }
 
+/**
+ * Implementation of the import code. This gets called from the public Appliance::ImportMachines()
+ * method as well as Appliance::importS3().
+ * @param aLocInfo
+ * @param aProgress
+ * @return
+ */
 HRESULT Appliance::importImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
 {
@@ -3956 +3966 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    // do not allow entering this method if the appliance is busy reading or writing
     if (!isApplianceIdle())
         return E_ACCESSDENIED;
@@ -3989 +4000 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (!isApplianceIdle())
-        return E_ACCESSDENIED;
 
     ComObjPtr<VFSExplorer> explorer;
@@ -4027 +4035 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    // do not allow entering this method if the appliance is busy reading or writing
     if (!isApplianceIdle())
         return E_ACCESSDENIED;
@@ -4079 +4088 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (!isApplianceIdle())
-        return E_ACCESSDENIED;
 
     com::SafeArray<BSTR> sfaWarnings(m->llWarnings.size());