Changeset 33067 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Oct 12, 2010 1:39:13 PM (14 years ago)

Author:

vboxsync

Message:

Main: fix broken per-machine media registry for OVF-import-from-vbox:Machine case (trunk regression)

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (11 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -406 +406 @@
                 unconst(mData->mUuid) = mData->pMachineConfigFile->uuid;
 
-                rc = loadMachineDataFromSettings(*mData->pMachineConfigFile);
+                rc = loadMachineDataFromSettings(*mData->pMachineConfigFile,
+                                                 NULL /* puuidRegistry */);
                 if (FAILED(rc)) throw rc;
 
@@ -496 +497 @@
         unconst(mData->mUuid).create();
 
-        rc = loadMachineDataFromSettings(config);
+        rc = loadMachineDataFromSettings(config,
+                                         &mData->mUuid); // puuidRegistry: initialize media with this registry ID
 
         // override VM name as well, it may be different
@@ -655 +657 @@
                                mParent->settingsFilePath().c_str());
 
-            rc = loadMachineDataFromSettings(*mData->pMachineConfigFile);
+            rc = loadMachineDataFromSettings(*mData->pMachineConfigFile,
+                                             NULL /* const Guid *puuidRegistry */);
             if (FAILED(rc)) throw rc;
         }
@@ -6813 +6816 @@
  * depending on the caller's use case, so the caller needs to set that herself.
  *
- * @param config
- * @param fAllowStorage
+ * This gets called in several contexts during machine initialization:
+ *
+ * -- When machine XML exists on disk already and needs to be loaded into memory,
+ *    for example, from registeredInit() to load all registered machines on
+ *    VirtualBox startup. In this case, puuidRegistry is NULL because the media
+ *    attached to the machine should be part of some media registry already.
+ *
+ * -- During OVF import, when a machine config has been constructed from an
+ *    OVF file. In this case, puuidRegistry is set to the machine UUID to
+ *    ensure that the media listed as attachments in the config (which have
+ *    been imported from the OVF) receive the correct registry ID.
+ *
+ * @param config Machine settings from XML.
+ * @param puuidRegistry If != NULL, Medium::setRegistryIdIfFirst() gets called with this registry ID for each attached medium in the config.
+ * @return
  */
-HRESULT Machine::loadMachineDataFromSettings(const settings::MachineConfigFile &config)
+HRESULT Machine::loadMachineDataFromSettings(const settings::MachineConfigFile &config,
+                                             const Guid *puuidRegistry)
 {
     // copy name, description, OS type, teleporter, UTC etc.
@@ -6886 +6903 @@
 
     // load storage controllers
-    rc = loadStorageControllers(config.storageMachine);
+    rc = loadStorageControllers(config.storageMachine,
+                                puuidRegistry,
+                                NULL /* puuidSnapshot */);
     if (FAILED(rc)) return rc;
 
     /*
-        *  NOTE: the assignment below must be the last thing to do,
-        *  otherwise it will be not possible to change the settings
-        *  somewehere in the code above because all setters will be
-        *  blocked by checkStateDependency(MutableStateDep).
-        */
+     *  NOTE: the assignment below must be the last thing to do,
+     *  otherwise it will be not possible to change the settings
+     *  somewehere in the code above because all setters will be
+     *  blocked by checkStateDependency(MutableStateDep).
+     */
 
     /* set the machine state to Aborted or Saved when appropriate */
@@ -7205 +7224 @@
 }
 
-  /**
-   *  @param aNode    <StorageControllers> node.
-   */
+/**
+ *  Called from loadMachineDataFromSettings() for the storage controller data, including media.
+ *
+ * @param data
+ * @param puuidRegistry media registry ID to set media to or NULL; see Machine::loadMachineDataFromSettings()
+ * @param puuidSnapshot
+ * @return
+ */
 HRESULT Machine::loadStorageControllers(const settings::Storage &data,
-                                        const Guid *aSnapshotId /* = NULL */)
+                                        const Guid *puuidRegistry,
+                                        const Guid *puuidSnapshot)
 {
     AssertReturn(!isSessionMachine(), E_FAIL);
@@ -7261 +7286 @@
         rc = loadStorageDevices(pCtl,
                                 ctlData,
-                                aSnapshotId);
+                                puuidRegistry,
+                                puuidSnapshot);
         if (FAILED(rc)) return rc;
     }
@@ -7269 +7295 @@
 
 /**
- * @param aNode        <HardDiskAttachments> node.
- * @param fAllowStorage if false, we produce an error if the config requests media attachments
- *                      (used with importing unregistered machines which cannot have media attachments)
+ * Called from loadStorageControllers for a controller's devices.
+ *
+ * @param aStorageController
+ * @param data
+ * @param puuidRegistry media registry ID to set media to or NULL; see Machine::loadMachineDataFromSettings()
  * @param aSnapshotId  pointer to the snapshot ID if this is a snapshot machine
- *
- * @note Lock mParent  for reading and hard disks for writing before calling.
+ * @return
  */
 HRESULT Machine::loadStorageDevices(StorageController *aStorageController,
                                     const settings::StorageController &data,
-                                    const Guid *aSnapshotId /*= NULL*/)
+                                    const Guid *puuidRegistry,
+                                    const Guid *puuidSnapshot)
 {
     HRESULT rc = S_OK;
@@ -7340 +7368 @@
                         return setError(E_FAIL,
                                         tr("A differencing image of snapshot {%RTuuid} could not be found. %ls"),
-                                        aSnapshotId->raw(),
+                                        puuidSnapshot->raw(),
                                         info.getText().raw());
                     }
@@ -7357 +7385 @@
                                         medium->getLocationFull().c_str(),
                                         dev.uuid.raw(),
-                                        aSnapshotId->raw(),
+                                        puuidSnapshot->raw(),
                                         mUserData->s.strName.c_str(),
                                         mData->m_strConfigFileFull.c_str());
@@ -7421 +7449 @@
         {
             if (isSnapshotMachine())
-                rc = medium->addBackReference(mData->mUuid, *aSnapshotId);
+                rc = medium->addBackReference(mData->mUuid, *puuidSnapshot);
             else
                 rc = medium->addBackReference(mData->mUuid);
+
+            if (puuidRegistry)
+                // caller wants registry ID to be set on all attached media (OVF import case)
+                medium->setRegistryIdIfFirst(*puuidRegistry);
         }