Changeset 33424 in vbox for trunk

Timestamp:

Oct 25, 2010 2:10:44 PM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: Allow overriding of the target disk path when there is some vbox.xml also.

File:

• trunk/src/VBox/Main/ApplianceImplImport.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -2430 +2430 @@
         }
 
+        /* Get all hard disk descriptions. */
+        std::list<VirtualSystemDescriptionEntry*> avsdeHDs = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskImage);
+
         // for each medium attachment to this controller...
         for (settings::AttachedDevicesList::iterator dit = sc.llAttachedDevices.begin();
@@ -2443 +2446 @@
             // convert the Guid to string
             Utf8Str strUuid = d.uuid.toString();
+
 
             // there must be an image in the OVF disk structs with the same UUID
@@ -2454 +2458 @@
                 if (di.uuidVbox == strUuid)
                 {
-                    Utf8Str strTargetPath(stack.strMachineFolder);
-                    strTargetPath.append(RTPATH_DELIMITER);
-                    strTargetPath.append(di.strHref);
-                    searchUniqueDiskImageFilePath(strTargetPath);
+                    VirtualSystemDescriptionEntry *vsdeTargetHD = 0;
+
+                    /* Iterate over all given disk images of the virtual system
+                     * disks description. We need to find the target disk path,
+                     * which could be changed by the user. */
+                    list<VirtualSystemDescriptionEntry*>::const_iterator itHD;
+                    for (itHD = avsdeHDs.begin();
+                         itHD != avsdeHDs.end();
+                         ++itHD)
+                    {
+                        VirtualSystemDescriptionEntry *vsdeHD = *itHD;
+                        if (vsdeHD->strRef == oit->first)
+                        {
+                            vsdeTargetHD = vsdeHD;
+                            break;
+                        }
+                    }
+                    if (!vsdeTargetHD)
+                        throw setError(E_FAIL,
+                                       tr("Internal inconsistency looking up disk image '%s'"),
+                                       oit->first.c_str());
 
                     /*
@@ -2466 +2487 @@
                     ComObjPtr<Medium> pTargetHD;
                     importOneDiskImage(di,
-                                       strTargetPath,
+                                       vsdeTargetHD->strVboxCurrent,
                                        pTargetHD,
                                        stack,