Changeset 36575 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 6, 2011 1:07:54 PM (14 years ago)

Author:

vboxsync

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

71014

Message:

Main/src-server/ApplianceImplImport: automatically repair broken OVF images with multiple disks, created by 3.2.8 and earlier

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (6 diffs)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2568 +2568 @@
     bool fDVD = vsdescThis->findByType(VirtualSystemDescriptionType_CDROM).size() > 0;
     /* Iterate over all storage controller check the attachments and remove
-     * them when necessary. */
+     * them when necessary. Also detect broken configs with more than one
+     * attachment. Old VirtualBox versions (prior to 3.2.10) had all disk
+     * attachments pointing to the last hard disk image, which causes import
+     * failures. A long fixed bug, however the OVF files are long lived. */
     settings::StorageControllersList &llControllers = config.storageMachine.llStorageControllers;
+    Guid hdUuid;
+    uint32_t cHardDisks = 0;
+    bool fInconsistent = false;
+    bool fRepairDuplicate = false;
     settings::StorageControllersList::iterator it3;
     for (it3 = llControllers.begin();
@@ -2587 +2594 @@
                    && it4->deviceType == DeviceType_Floppy))
                 llAttachments.erase(it4++);
+            else if (it4->deviceType == DeviceType_HardDisk)
+            {
+                const Guid &thisUuid = it4->uuid;
+                cHardDisks++;
+                if (cHardDisks == 1)
+                {
+                    if (hdUuid.isEmpty())
+                        hdUuid = thisUuid;
+                    else
+                        fInconsistent = true;
+                }
+                else
+                {
+                    if (thisUuid.isEmpty())
+                        fInconsistent = true;
+                    else if (thisUuid == hdUuid)
+                        fRepairDuplicate = true;
+                }
+            }
         }
     }
-
+    /* paranoia... */
+    if (fInconsistent || cHardDisks == 1)
+        fRepairDuplicate = false;
 
     /*
@@ -2596 +2624 @@
      *
      */
+
+    /* Get all hard disk descriptions. */
+    std::list<VirtualSystemDescriptionEntry*> avsdeHDs = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskImage);
+    std::list<VirtualSystemDescriptionEntry*>::iterator avsdeHDsIt = avsdeHDs.begin();
+    /* paranoia - if there is no 1:1 match do not try to repair. */
+    if (cHardDisks != avsdeHDs.size())
+        fRepairDuplicate = false;
 
     // for each storage controller...
@@ -2617 +2652 @@
         }
 
-        /* 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();
@@ -2631 +2663 @@
                 continue;
 
+            // When repairing a broken VirtualBox xml config section (written
+            // by VirtualBox versions earlier than 3.2.10) assume the disks
+            // show up in the same order as in the OVF description.
+            if (fRepairDuplicate)
+            {
+                VirtualSystemDescriptionEntry *vsdeHD = *avsdeHDsIt;
+                ovf::DiskImagesMap::const_iterator itDiskImage = stack.mapDisks.find(vsdeHD->strRef);
+                if (itDiskImage != stack.mapDisks.end())
+                {
+                    const ovf::DiskImage &di = itDiskImage->second;
+                    d.uuid = Guid(di.uuidVbox);
+                }
+                ++avsdeHDsIt;
+            }
+
             // convert the Guid to string
             Utf8Str strUuid = d.uuid.toString();
-
 
             // there must be an image in the OVF disk structs with the same UUID