Changeset 49620 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (2 diffs)
• src-server/ApplianceImpl.cpp (modified) (2 diffs)
• src-server/ApplianceImplImport.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -23 +23 @@
 /* VBox includes */
 #include "VirtualBoxBase.h"
+#include "MediumFormatImpl.h"
 
 /* Todo: This file needs massive cleanup. Split IAppliance in a public and
@@ -154 +155 @@
 
     Utf8Str applianceIOName(APPLIANCEIONAME type) const;
+
+    HRESULT findMediumFormatFromDiskImage(const ovf::DiskImage &di, ComObjPtr<MediumFormat>& mf);
 
     /*******************************************************************************

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

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

@@ -631 +631 @@
                      * So possibly, we aren't able to recognize some URIs.
                      */
-                    Utf8Str vdf = 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 (vdf.isEmpty())
-                    {
-                        /* Figure out from extension which format the image of disk has. */
-                        {
-                            char *pszExt = RTPathSuffix(di.strHref.c_str());
-                            if (pszExt)
-                                pszExt++;
-                            /* Get the system properties. */
-                            SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
-                            ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(pszExt);
-                            if (trgFormat.isNull())
-                            {
-                                throw setError(E_FAIL,
-                                       tr("Internal inconsistency looking up medium format for the disk image '%s'"),
-                                       di.strHref.c_str());
-                            }
-
-                            Bstr bstrFormatName;
-                            rc = trgFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
-                            if (FAILED(rc))
-                                throw rc;
-
-                            vdf = Utf8Str(bstrFormatName);
-                        }
-                    }
+
+                    ComObjPtr<MediumFormat> mediumFormat;
+                    rc = findMediumFormatFromDiskImage(di, mediumFormat);
+                    if (FAILED(rc))
+                        throw rc;
+
+                    Bstr bstrFormatName;
+                    rc = mediumFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
+                    if (FAILED(rc))
+                        throw rc;
+
+                    Utf8Str vdf = Utf8Str(bstrFormatName);
 
                     // @todo:
@@ -2301 +2282 @@
                 strTempTargetFilename = strTempTargetFilename.stripPath();
                 strTempTargetFilename = strTempTargetFilename.stripSuffix();
-                Utf8Str vdf = typeOfVirtualDiskFormatFromURI(di.strFormat);
 
                 strTargetDir.append(strTempTargetFilename);
@@ -2462 +2442 @@
                     /* We need a proper source format description */
                     /* Which format to use? */
-                    Utf8Str strSrcFormat = typeOfVirtualDiskFormatFromURI(di.strFormat);
-
-                    ComObjPtr<MediumFormat> srcFormat = pSysProps->mediumFormat(strSrcFormat);
-                    if (srcFormat.isNull())
+                    ComObjPtr<MediumFormat> srcFormat; 
+                    rc = findMediumFormatFromDiskImage(di, srcFormat);
+                    if (FAILED(rc))
                         throw setError(VBOX_E_NOT_SUPPORTED,
                                        tr("Could not find a valid medium format for the source disk '%s' "
-                                          "Check correctness of the image format URL in the OVF description file."),
+                                          "Check correctness of the image format URL in the OVF description file "
+                                          "or extension of the image"),
                                        RTPathFilename(strSourceOVF.c_str()));
 
@@ -3184 +3164 @@
                 vsdeTargetHD->strVboxCurrent.c_str(), mhda.lControllerPort, mhda.lDevice));
 
-                Utf8Str vdf = typeOfVirtualDiskFormatFromURI(diCurrent.strFormat);
+                ComObjPtr<MediumFormat> mediumFormat;
+                rc = findMediumFormatFromDiskImage(diCurrent, mediumFormat);
+                if (FAILED(rc))
+                    throw rc;
+
+                Bstr bstrFormatName;
+                rc = mediumFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
+                if (FAILED(rc))
+                    throw rc;
+
+                Utf8Str vdf = Utf8Str(bstrFormatName);
 
                 if (vdf.compare("RAW", Utf8Str::CaseInsensitive) == 0)
@@ -3699 +3689 @@
                 Bstr hdId;
 
-                Utf8Str vdf = typeOfVirtualDiskFormatFromURI(diCurrent.strFormat);
+                ComObjPtr<MediumFormat> mediumFormat;
+                rc = findMediumFormatFromDiskImage(diCurrent, mediumFormat);
+                if (FAILED(rc))
+                    throw rc;
+
+                Bstr bstrFormatName;
+                rc = mediumFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
+                if (FAILED(rc))
+                    throw rc;
+
+                Utf8Str vdf = Utf8Str(bstrFormatName);
 
                 if (vdf.compare("RAW", Utf8Str::CaseInsensitive) == 0)