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

Timestamp:

Apr 9, 2010 5:38:56 PM (15 years ago)

Author:

vboxsync

Message:

Main/OVF: optimizations, cleanup

File:

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

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -1225 +1225 @@
     if (vsdeOS.size() < 1)
         throw setError(VBOX_E_FILE_ERROR,
-                        tr("Missing guest OS type"));
+                       tr("Missing guest OS type"));
     const Utf8Str &strOsTypeVBox = vsdeOS.front()->strVbox;
 
@@ -1238 +1238 @@
     if (vsdeName.size() < 1)
         throw setError(VBOX_E_FILE_ERROR,
-                        tr("Missing VM name"));
+                       tr("Missing VM name"));
     const Utf8Str &strNameVBox = vsdeName.front()->strVbox;
     rc = mVirtualBox->CreateMachine(Bstr(strNameVBox),
@@ -1292 +1292 @@
     if (FAILED(rc)) throw rc;
 
-    /* I/O APIC: so far we have no setting for this. Enable it if we
-        import a Windows VM because if if Windows was installed without IOAPIC,
-        it will not mind finding an one later on, but if Windows was installed
-        _with_ an IOAPIC, it will bluescreen if it's not found */
-    Bstr bstrFamilyId;
-    rc = osType->COMGETTER(FamilyId)(bstrFamilyId.asOutParam());
-    if (FAILED(rc)) throw rc;
-
-    Utf8Str strFamilyId(bstrFamilyId);
-    if (strFamilyId == "Windows")
-        fEnableIOApic = true;
-
-    /* If IP-APIC should be enabled could be have different reasons.
-        See CPU count & the Win test above. Here we enable it if it was
-        previously requested. */
+    // I/O APIC: Generic OVF has no setting for this. Enable it if we
+    // import a Windows VM because if if Windows was installed without IOAPIC,
+    // it will not mind finding an one later on, but if Windows was installed
+    // _with_ an IOAPIC, it will bluescreen if it's not found
+    if (!fEnableIOApic)
+    {
+        Bstr bstrFamilyId;
+        rc = osType->COMGETTER(FamilyId)(bstrFamilyId.asOutParam());
+        if (FAILED(rc)) throw rc;
+        if (bstrFamilyId == "Windows")
+            fEnableIOApic = true;
+    }
+
     if (fEnableIOApic)
     {
@@ -1361 +1359 @@
         if (FAILED(rc)) throw rc;
     }
+    else if (vsdeNW.size() > SchemaDefs::NetworkAdapterCount)
+        throw setError(VBOX_E_FILE_ERROR,
+                       tr("Too many network adapters: OVF requests %d network adapters, but VirtualBox only supports %d"),
+                       vsdeNW.size(), SchemaDefs::NetworkAdapterCount);
     else
     {
         list<VirtualSystemDescriptionEntry*>::const_iterator nwIt;
-        /* Iterate through all network cards. We support 8 network adapters
-            * at the maximum. (@todo: warn if there are more!) */
         size_t a = 0;
         for (nwIt = vsdeNW.begin();
-             (nwIt != vsdeNW.end() && a < SchemaDefs::NetworkAdapterCount);
+             nwIt != vsdeNW.end();
              ++nwIt, ++a)
         {
@@ -1396 +1396 @@
                 rc = host->COMGETTER(NetworkInterfaces)(ComSafeArrayAsOutParam(nwInterfaces));
                 if (FAILED(rc)) throw rc;
-                /* We search for the first host network interface which
-                    * is usable for bridged networking */
+                // We search for the first host network interface which
+                // is usable for bridged networking
                 for (size_t j = 0;
-                        j < nwInterfaces.size();
-                        ++j)
+                     j < nwInterfaces.size();
+                     ++j)
                 {
                     HostNetworkInterfaceType_T itype;
@@ -1429 +1429 @@
                 rc = host->COMGETTER(NetworkInterfaces)(ComSafeArrayAsOutParam(nwInterfaces));
                 if (FAILED(rc)) throw rc;
-                /* We search for the first host network interface which
-                    * is usable for host only networking */
+                // We search for the first host network interface which
+                // is usable for host only networking
                 for (size_t j = 0;
-                        j < nwInterfaces.size();
-                        ++j)
+                     j < nwInterfaces.size();
+                     ++j)
                 {
                     HostNetworkInterfaceType_T itype;
@@ -1457 +1457 @@
     if (vsdeHDCIDE.size() > 1)
         throw setError(VBOX_E_FILE_ERROR,
-                        tr("Too many IDE controllers in OVF; import facility only supports one"));
+                       tr("Too many IDE controllers in OVF; import facility only supports one"));
     if (vsdeHDCIDE.size() == 1)
     {
@@ -1482 +1482 @@
     if (vsdeHDCSATA.size() > 1)
         throw setError(VBOX_E_FILE_ERROR,
-                        tr("Too many SATA controllers in OVF; import facility only supports one"));
+                       tr("Too many SATA controllers in OVF; import facility only supports one"));
     if (vsdeHDCSATA.size() > 0)
     {
@@ -1494 +1494 @@
         else
             throw setError(VBOX_E_FILE_ERROR,
-                            tr("Invalid SATA controller type \"%s\""),
-                            hdcVBox.c_str());
+                           tr("Invalid SATA controller type \"%s\""),
+                           hdcVBox.c_str());
     }
 #endif /* VBOX_WITH_AHCI */
@@ -1504 +1504 @@
     if (vsdeHDCSCSI.size() > 1)
         throw setError(VBOX_E_FILE_ERROR,
-                        tr("Too many SCSI controllers in OVF; import facility only supports one"));
+                       tr("Too many SCSI controllers in OVF; import facility only supports one"));
     if (vsdeHDCSCSI.size() > 0)
     {
@@ -1516 +1516 @@
         else
             throw setError(VBOX_E_FILE_ERROR,
-                            tr("Invalid SCSI controller type \"%s\""),
-                            hdcVBox.c_str());
+                           tr("Invalid SCSI controller type \"%s\""),
+                           hdcVBox.c_str());
 
         rc = pNewMachine->AddStorageController(Bstr("SCSI Controller"), StorageBus_SCSI, pController.asOutParam());
@@ -1540 +1540 @@
     if (vsdeFloppy.size() > 1)
         throw setError(VBOX_E_FILE_ERROR,
-                        tr("Too many floppy controllers in OVF; import facility only supports one"));
+                       tr("Too many floppy controllers in OVF; import facility only supports one"));
     std::list<VirtualSystemDescriptionEntry*> vsdeCDROM = vsdescThis->findByType(VirtualSystemDescriptionType_CDROM);
     if (    (vsdeFloppy.size() > 0)
-            || (vsdeCDROM.size() > 0)
-        )
+         || (vsdeCDROM.size() > 0)
+       )
     {
         // If there's an error here we need to close the session, so
@@ -1552 +1552 @@
         {
             /* In order to attach things we need to open a session
-                * for the new machine */
+             * for the new machine */
             rc = mVirtualBox->OpenSession(stack.pSession, bstrNewMachineId);
             if (FAILED(rc)) throw rc;
@@ -1592 +1592 @@
             }
 
-
             // CD-ROMs next
             for (std::list<VirtualSystemDescriptionEntry*>::const_iterator jt = vsdeCDROM.begin();
-                    jt != vsdeCDROM.end();
-                    ++jt)
+                 jt != vsdeCDROM.end();
+                 ++jt)
             {
                 // for now always attach to secondary master on IDE controller;
@@ -1695 +1694 @@
                     /* This isn't allowed */
                     throw setError(VBOX_E_FILE_ERROR,
-                                    tr("Destination file '%s' exists",
-                                        vsdeHD->strVbox.c_str()));
+                                   tr("Destination file '%s' exists"),
+                                   vsdeHD->strVbox.c_str());
 
                 /* Find the disk from the OVF's disk list */
                 ovf::DiskImagesMap::const_iterator itDiskImage = stack.mapDisks.find(vsdeHD->strRef);
-                /* vsdeHD->strRef contains the disk identifier (e.g. "vmdisk1"), which should exist
-                   in the virtual system's disks map under that ID and also in the global images map. */
+                // vsdeHD->strRef contains the disk identifier (e.g. "vmdisk1"), which should exist
+                // in the virtual system's disks map under that ID and also in the global images map
                 ovf::VirtualDisksMap::const_iterator itVirtualDisk = vsysThis.mapVirtualDisks.find(vsdeHD->strRef);
 
@@ -1708 +1707 @@
                    )
                     throw setError(E_FAIL,
-                                    tr("Internal inconsistency looking up disk images."));
+                                   tr("Internal inconsistency looking up disk images."));
 
                 const ovf::DiskImage &di = itDiskImage->second;
@@ -1753 +1752 @@
                                             strSrcFilePath.c_str());
 
-                    /* Clone the disk image (this is necessary cause the id has
-                        * to be recreated for the case the same hard disk is
-                        * attached already from a previous import) */
-
-                    /* First open the existing disk image */
+                    // Clone the disk image (this is necessary cause the id has
+                    // to be recreated for the case the same hard disk is
+                    // attached already from a previous import)
+
+                    // First open the existing disk image
                     rc = mVirtualBox->OpenHardDisk(Bstr(strSrcFilePath),
                                                     AccessMode_ReadOnly,
@@ -1879 +1878 @@
     HRESULT rc = pNewMachine.createObject();
     if (FAILED(rc)) throw rc;
-    rc = pNewMachine->init(mVirtualBox, strNameVBox, config);
+
+    // this magic constructor fills the new machine object with the MachineConfig
+    // instance that we created from the vbox:Machine
+    rc = pNewMachine->init(mVirtualBox,
+                           strNameVBox,         // name from just above (can be suffixed to avoid duplicates)
+                           config);             // the whole machine config
     if (FAILED(rc)) throw rc;
 
+    // return the new machine as an IMachine
     IMachine *p;
     rc = pNewMachine.queryInterfaceTo(&p);
     if (FAILED(rc)) throw rc;
-
     pReturnNewMachine = p;
 
+    // and register it
     rc = mVirtualBox->RegisterMachine(pNewMachine);
     if (FAILED(rc)) throw rc;