Changeset 28110 in vbox for trunk/src/VBox/Main/include

Timestamp:

Apr 8, 2010 6:07:13 PM (15 years ago)

Author:

vboxsync

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

59826

Message:

Main: more Machine::init() work to get OVF vbox:Machine import running; works now for machines without media attachments

Location:

trunk/src/VBox/Main/include

Files:

• ApplianceImpl.h (modified) (1 diff)
• MachineImpl.h (modified) (5 diffs)

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

@@ -148 +148 @@
     HRESULT importFS(const LocationInfo &locInfo, ComObjPtr<Progress> &aProgress);
     struct ImportStack;
-    void importVBoxMachine(const settings::MachineConfigFile &config,
+    void importVBoxMachine(ComObjPtr<VirtualSystemDescription> &vsdescThis,
                            ComPtr<IMachine> &pNewMachine,
                            ImportStack &stack);

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

@@ -364 +364 @@
                  const Guid *aId);
 
+    // initializer for machine config in memory (OVF import)
+    HRESULT init(VirtualBox *aParent,
+                 const Utf8Str &strName,
+                 const settings::MachineConfigFile &config);
+
     void uninit();
 
@@ -370 +375 @@
                      const Utf8Str &strConfigFile);
     HRESULT initDataAndChildObjects();
+    HRESULT registeredInit();
+    HRESULT tryCreateMachineConfigFile(BOOL aOverride);
     void uninitDataAndChildObjects();
 
@@ -703 +710 @@
 protected:
 
-    HRESULT registeredInit();
-
     HRESULT checkStateDependency(StateDependency aDepType);
 
@@ -718 +723 @@
 
     HRESULT loadSettings(bool aRegistered);
+    HRESULT loadMachineDataFromSettings(const settings::MachineConfigFile &config);
     HRESULT loadSnapshot(const settings::Snapshot &data,
                          const Guid &aCurSnapshotId,
@@ -723 +729 @@
     HRESULT loadHardware(const settings::Hardware &data);
     HRESULT loadStorageControllers(const settings::Storage &data,
-                                   bool aRegistered,
                                    const Guid *aSnapshotId = NULL);
     HRESULT loadStorageDevices(StorageController *aStorageController,
                                const settings::StorageController &data,
-                               bool aRegistered,
                                const Guid *aSnapshotId = NULL);