Changeset 18273 in vbox for trunk/src

Timestamp:

Mar 25, 2009 6:32:26 PM (16 years ago)

Author:

vboxsync

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

45022

Message:

OVF: fix export breakage from IProgress update

File:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -3237 +3237 @@
     }
 
-    ULONG ulTotalOperationsWeight = ulTotalMB * 100 / ulPercentForDisks;
-    m->ulWeightPerOperation = ulTotalOperationsWeight / 100;
+    ULONG ulTotalOperationsWeight;
+    if (ulTotalMB)
+    {
+        ulTotalOperationsWeight = ulTotalMB * 100 / ulPercentForDisks;
+        m->ulWeightPerOperation = ulTotalOperationsWeight / 100;
+    }
+    else
+    {
+        ulTotalOperationsWeight = cFixed;
+        m->ulWeightPerOperation = 1;
+    }
 
     Log(("Setting up progress object: ulTotalMB = %d, cFixed = %d, cDisks = %d, => cOperations = %d, ulTotalOperationsWeight = %d, m->ulWeightPerOperation = %d\n",
@@ -3870 +3879 @@
             Bstr bstrLocation;
             rc = pHardDisk->COMGETTER(Location)(bstrLocation.asOutParam());
+            if (FAILED(rc)) throw rc;
             Bstr bstrName;
             rc = pHardDisk->COMGETTER(Name)(bstrName.asOutParam());
+            if (FAILED(rc)) throw rc;
+            ULONG64 ullSize;
+            rc = pHardDisk->COMGETTER(Size)(&ullSize);
+            if (FAILED(rc)) throw rc;
 
             // and how this translates to the virtual system
@@ -3920 +3934 @@
                                strTargetVmdkName,   // OVF value:
                                Utf8Str(bstrLocation), // vbox value: media path
+                               (uint32_t)(ullSize / _1M),
                                Utf8StrFmt("controller=%RI32;channel=%RI32", lControllerVsys, lChannelVsys));
         }