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

Timestamp:

Nov 22, 2013 10:37:17 AM (12 years ago)

Author:

vboxsync

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

90839

Message:

pr7072. Search an appropriate medium format using, firstly, URL given in the OVF description file and, secondly, using an image extension.

File:

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

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

@@ -29 +29 @@
 #include "ProgressImpl.h"
 #include "MachineImpl.h"
-#include "MediumFormatImpl.h"
 #include "SystemPropertiesImpl.h"
 #include "AutoCaller.h"
@@ -728 +727 @@
 }
 
+
+/**
+ * Returns a medium format object corresponding to the given 
+ * disk image or null if no such format. 
+ *
+ * @param di   Disk Image
+ * @param mf   Medium Format
+ *
+ * @return ComObjPtr<MediumFormat>
+ */
+HRESULT Appliance::findMediumFormatFromDiskImage(const ovf::DiskImage &di, ComObjPtr<MediumFormat>& mf)
+{
+    HRESULT rc = S_OK;
+
+    /* Get the system properties. */
+    SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
+
+    /* We need a proper source format description */
+    /* Which format to use? */
+    Utf8Str strSrcFormat = typeOfVirtualDiskFormatFromURI(di.strFormat);
+
+    /*
+     * fallback, if we can't determine virtual disk format using URI from the attribute ovf:format
+     * in the corresponding section <Disk> in the OVF file.
+     */
+    if (strSrcFormat.isEmpty())
+    {
+        /* Figure out from extension which format the image of disk has. */
+        {
+            char *pszExt = RTPathSuffix(di.strHref.c_str());
+            if (pszExt)
+                pszExt++;
+            mf = pSysProps->mediumFormatFromExtension(pszExt);
+        }
+    }
+    else
+        mf = pSysProps->mediumFormat(strSrcFormat);
+
+    if (mf.isNull())
+    {
+        rc = setError(E_FAIL,
+               tr("Internal inconsistency looking up medium format for the disk image '%s'"),
+               di.strHref.c_str());
+    }
+
+    return rc;
+}
+
 /**
  * Returns true if the appliance is in "idle" state. This should always be the