Changeset 28110 in vbox for trunk/src/VBox/Main/ApplianceImplImport.cpp

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

File:

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

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -34 +34 @@
 #include "GuestOSTypeImpl.h"
 #include "ProgressImpl.h"
+#include "MachineImpl.h"
 
 #include "AutoCaller.h"
@@ -1121 +1122 @@
 
             if (vsdescThis->m->pConfig)
-                importVBoxMachine(*vsdescThis->m->pConfig, pNewMachine, stack);
+                importVBoxMachine(vsdescThis, pNewMachine, stack);
             else
                 importMachineGeneric(vsysThis, vsdescThis, pNewMachine, stack);
         }
-        catch(HRESULT aRC)
+        catch (HRESULT aRC)
         {
             rc = aRC;
@@ -1367 +1368 @@
         size_t a = 0;
         for (nwIt = vsdeNW.begin();
-                (nwIt != vsdeNW.end() && a < SchemaDefs::NetworkAdapterCount);
-                ++nwIt, ++a)
+             (nwIt != vsdeNW.end() && a < SchemaDefs::NetworkAdapterCount);
+             ++nwIt, ++a)
         {
             const VirtualSystemDescriptionEntry* pvsys = *nwIt;
@@ -1529 +1530 @@
     if (FAILED(rc)) throw rc;
 
+    // store new machine for roll-back in case of errors
     Bstr bstrNewMachineId;
     rc = pNewMachine->COMGETTER(Id)(bstrNewMachineId.asOutParam());
     if (FAILED(rc)) throw rc;
-
-    // store new machine for roll-back in case of errors
     stack.llMachinesRegistered.push_back(bstrNewMachineId);
 
@@ -1862 +1862 @@
  * @param stack
  */
-void Appliance::importVBoxMachine(const settings::MachineConfigFile &config,
-                                  ComPtr<IMachine> &pNewMachine,
+void Appliance::importVBoxMachine(ComObjPtr<VirtualSystemDescription> &vsdescThis,
+                                  ComPtr<IMachine> &pReturnNewMachine,
                                   ImportStack &stack)
 {
+    Assert(vsdescThis->m->pConfig);
+    const settings::MachineConfigFile &config = *vsdescThis->m->pConfig;
+
+    // use the name that we computed in the OVF fields to avoid duplicates
+    std::list<VirtualSystemDescriptionEntry*> vsdeName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
+    if (vsdeName.size() < 1)
+        throw setError(VBOX_E_FILE_ERROR,
+                        tr("Missing VM name"));
+    const Utf8Str &strNameVBox = vsdeName.front()->strVbox;
+
+    ComObjPtr<Machine> pNewMachine;
+    HRESULT rc = pNewMachine.createObject();
+    if (FAILED(rc)) throw rc;
+    rc = pNewMachine->init(mVirtualBox, strNameVBox, config);
+    if (FAILED(rc)) throw rc;
+
+    IMachine *p;
+    rc = pNewMachine.queryInterfaceTo(&p);
+    if (FAILED(rc)) throw rc;
+
+    pReturnNewMachine = p;
+
+    rc = mVirtualBox->RegisterMachine(pNewMachine);
+    if (FAILED(rc)) throw rc;
+
+    // store new machine for roll-back in case of errors
+    Bstr bstrNewMachineId;
+    rc = pNewMachine->COMGETTER(Id)(bstrNewMachineId.asOutParam());
+    if (FAILED(rc)) throw rc;
+    stack.llMachinesRegistered.push_back(bstrNewMachineId);
 }