Changeset 17832 in vbox

Timestamp:

Mar 13, 2009 3:01:46 PM (16 years ago)

Author:

vboxsync

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

44373

Message:

OVF: export SCSI controller only if there is one; make stream optimized vmdk export default

File:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2900 +2900 @@
             if (FAILED(rc)) throw rc;
 
-            /* Based on the file extensions we choose the right format for the
-             * disk */
-            Bstr bstrSrcFormat = L"VDI";
-            if (strTargetFilePath.endsWith(".vmdk", Utf8Str::CaseInsensitive))
-                bstrSrcFormat = L"VMDK";
+            /* We are always exporting to vmdfk stream optimized for now */
+            Bstr bstrSrcFormat = L"VMDK";
 
             // create a new hard disk interface for the destination disk image
@@ -2916 +2913 @@
             {
                 // clone the source disk image
-                rc = pSourceDisk->CloneTo(pTargetDisk, HardDiskVariant_Standard, pProgress2.asOutParam());
+                rc = pSourceDisk->CloneTo(pTargetDisk, HardDiskVariant_VmdkStreamOptimized, pProgress2.asOutParam());
                 if (FAILED(rc)) throw rc;
 
@@ -3429 +3426 @@
 //     <const name="HardDiskControllerSCSI" value="8" />
         rc = GetStorageControllerByName(Bstr("SCSI"), pController.asOutParam());
-        rc = pController->COMGETTER(ControllerType)(&ctlr);
-        if (FAILED(rc)) throw rc;
-        strVbox = "LsiLogic";       // the default in VBox
-        switch(ctlr)
+        if (SUCCEEDED (rc))
         {
-            case StorageControllerType_LsiLogic: strVbox = "LsiLogic"; break;
-            case StorageControllerType_BusLogic: strVbox = "BusLogic"; break;
-        }
-        if (SUCCEEDED(rc))
-        {
-            lSCSIControllerIndex = (int32_t)pNewDesc->m->llDescriptions.size();
-            pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSCSI,
-                               Utf8StrFmt("%d", lSCSIControllerIndex),
-                               strVbox,
-                               "");
+            rc = pController->COMGETTER(ControllerType)(&ctlr);
+            if (FAILED(rc)) throw rc;
+            strVbox = "LsiLogic";       // the default in VBox
+            switch(ctlr)
+            {
+                case StorageControllerType_LsiLogic: strVbox = "LsiLogic"; break;
+                case StorageControllerType_BusLogic: strVbox = "BusLogic"; break;
+            }
+            if (SUCCEEDED(rc))
+            {
+                lSCSIControllerIndex = (int32_t)pNewDesc->m->llDescriptions.size();
+                pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSCSI,
+                                   Utf8StrFmt("%d", lSCSIControllerIndex),
+                                   strVbox,
+                                   "");
+            }
         }