Changeset 18306 in vbox

Timestamp:

Mar 26, 2009 11:57:52 AM (16 years ago)

Author:

vboxsync

Message:

OVF: fix progress values for disks on import

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (8 diffs)
• ProgressImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -51 +51 @@
     int64_t iCapacity;              // value from DiskSection/Disk/@capacity;
                                     // (maximum size for dynamic images, I guess; we always translate this to bytes)
-    int64_t iPopulatedSize;         // value from DiskSection/Disk/@populatedSize
+    int64_t iPopulatedSize;         // optional value from DiskSection/Disk/@populatedSize
                                     // (actual used size of disk, always in bytes; can be an estimate of used disk
-                                    // space, but cannot be larger than iCapacity)
+                                    // space, but cannot be larger than iCapacity; -1 if not set)
     Utf8Str strFormat;              // value from DiskSection/Disk/@format
                 // typically http://www.vmware.com/specifications/vmdk.html#sparse
@@ -1551 +1551 @@
                                                   pController->ulIndex,
                                                   hd.ulAddressOnParent);
+                        ULONG ulSize = 0;
+                        if (di.iPopulatedSize != -1)
+                            ulSize = (ULONG)(di.iPopulatedSize / _1M);
+                        else if (di.iSize != -1)
+                            ulSize = (ULONG)(di.iSize / _1M);
+                        else if (di.iCapacity != -1)
+                            ulSize = (ULONG)(di.iCapacity / _1M);
+                        if (ulSize == 0)
+                            ulSize = 10000;         // assume 10 GB, this is for the progress bar only anyway
                         pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskImage,
                                            hd.strDiskId,
                                            di.strHref,
                                            strPath,
-                                           (uint32_t)(di.iPopulatedSize / _1M),
+                                           ulSize,
                                            strExtraConfig);
                     }
@@ -1745 +1754 @@
             }
 
-            if (!task->progress.isNull())
-                rc = task->progress->setCurrentOperationProgress(20);       // let's say 1/5 of the XML is done here
-
             /* CPU count (ignored for now) */
             // EntriesList vsdeCPU = vsd->findByType (VirtualSystemDescriptionType_CPU);
@@ -1768 +1774 @@
             rc = pNewMachine->COMSETTER(VRAMSize)(vramVBox);
             if (FAILED(rc)) throw rc;
-
-            if (!task->progress.isNull())
-                rc = task->progress->setCurrentOperationProgress(40);       // let's say 2/5 of the XML is done here
 
             /* Audio Adapter */
@@ -1804 +1807 @@
             if (FAILED(rc)) throw rc;
 #endif /* VBOX_WITH_USB */
-
-            if (!task->progress.isNull())
-                rc = task->progress->setCurrentOperationProgress(60);       // let's say 3/5 of the XML is done here
 
             /* Change the network adapters */
@@ -1918 +1918 @@
             if (FAILED(rc)) throw rc;
 
-            if (!task->progress.isNull())
-                rc = task->progress->setCurrentOperationProgress(80);       // let's say 4/5 of the XML is done here
-
             /* CDROM drive */
             /* @todo: I can't disable the CDROM. So nothing to do for now */
@@ -2004 +2001 @@
             if (FAILED(rc)) throw rc;
 
-            if (!task->progress.isNull())
-                rc = task->progress->setCurrentOperationProgress(90);
-
             // store new machine for roll-back in case of errors
             llMachinesRegistered.push_back(newMachineId);
@@ -3160 +3154 @@
         std::list<VirtualSystemDescriptionEntry*>::const_iterator itH;
         for (itH = avsdeHDs.begin();
-                itH != avsdeHDs.end();
-                ++itH)
+             itH != avsdeHDs.end();
+             ++itH)
         {
-            ulTotalMB += (**itH).ulSizeMB;
+            const VirtualSystemDescriptionEntry *pHD = *itH;
+            ulTotalMB += pHD->ulSizeMB;
             ++cDisks;
         }

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -859 +859 @@
     m_ulOperationPercent = 0;
 
-    Log(("Progress::setNextOperation(%ls): ulNextOperationsWeight = %d; m_ulCurrentOperation is now %d, m_ulOperationsCompletedWeightis now %d\n",
+    Log(("Progress::setNextOperation(%ls): ulNextOperationsWeight = %d; m_ulCurrentOperation is now %d, m_ulOperationsCompletedWeight is now %d\n",
          m_bstrOperationDescription.raw(), ulNextOperationsWeight, m_ulCurrentOperation, m_ulOperationsCompletedWeight));