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

Timestamp:

May 17, 2016 1:56:51 PM (9 years ago)

Author:

vboxsync

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

107259

Message:

Main/Appliance: a little bit too much of the future went into the previous change

File:

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

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

@@ -469 +469 @@
             if (vsysThis.pelmVBoxMachine)
             {
-                settings::StorageControllersList &llControllers = pNewDesc->m->pConfig->hardwareMachine.storage.llStorageControllers;
+                settings::StorageControllersList &llControllers = pNewDesc->m->pConfig->storageMachine.llStorageControllers;
                 settings::StorageControllersList::iterator it3;
                 for (it3 = llControllers.begin();
@@ -3579 +3579 @@
      * 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.hardwareMachine.storage.llStorageControllers;
+    settings::StorageControllersList &llControllers = config.storageMachine.llStorageControllers;
     Guid hdUuid;
     uint32_t cDisks = 0;
@@ -3792 +3792 @@
 
         // for each storage controller...
-        for (settings::StorageControllersList::iterator sit = config.hardwareMachine.storage.llStorageControllers.begin();
-             sit != config.hardwareMachine.storage.llStorageControllers.end();
+        for (settings::StorageControllersList::iterator sit = config.storageMachine.llStorageControllers.begin();
+             sit != config.storageMachine.llStorageControllers.end();
              ++sit)
         {
@@ -3910 +3910 @@
                 break;
             } // for (settings::AttachedDevicesList::const_iterator dit = sc.llAttachedDevices.begin();
-        } // for (settings::StorageControllersList::const_iterator sit = config.hardwareMachine.storage.llStorageControllers.begin();
+        } // for (settings::StorageControllersList::const_iterator sit = config.storageMachine.llStorageControllers.begin();
 
             // no disk with such a UUID found:
@@ -4093 +4093 @@
     HRESULT rc = S_OK;
 
-    settings::StorageControllersList &llControllers = config->hardwareMachine.storage.llStorageControllers;
+    settings::StorageControllersList &llControllers = config->storageMachine.llStorageControllers;
     settings::StorageControllersList::iterator itscl;
     for (itscl = llControllers.begin();