Changeset 16587 in vbox

Timestamp:

Feb 9, 2009 1:48:57 PM (16 years ago)

Author:

vboxsync

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

42551

Message:

OVF: minor updates

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1282 +1282 @@
             uint64_t ullMemSizeVBox = vsysThis.ullMemorySize / _1M;
             /* Check for the constrains */
-            if (ullMemSizeVBox != 0 && 
+            if (ullMemSizeVBox != 0 &&
                 (ullMemSizeVBox < static_cast<uint64_t>(SchemaDefs::MinGuestRAM) ||
                  ullMemSizeVBox > static_cast<uint64_t>(SchemaDefs::MaxGuestRAM)))
@@ -1396 +1396 @@
                                 if (cIDEused == 1)
                                     pNewDesc->addWarning(tr("The virtual system claims support for more than one IDE controller, but VirtualBox has support for only one."));
-                                                     
+
                             }
                             ++cIDEused;
@@ -1420 +1420 @@
                                 if (cSATAused == 1)
                                     pNewDesc->addWarning(tr("The virtual system claims support for more than one SATA controller, but VirtualBox has support for only one."));
-                                                     
+
                             }
                             ++cSATAused;
@@ -1449 +1449 @@
                                 if (cSCSIused == 1)
                                     pNewDesc->addWarning(tr("The virtual system claims support for more than one SCSI controller, but VirtualBox has support for only one."));
-                                                     
+
                             }
                             ++cSCSIused;
@@ -1542 +1542 @@
 
     ComObjPtr<Progress> progress;
-
     try
     {
@@ -1880 +1879 @@
                    the machine, so make an extra try/catch block. */
                 ComPtr<ISession> session;
+                ComPtr<IHardDisk2> srcHdVBox;
                 try
                 {
-                    // in order to attach hard disks we need to open a session for the new machine
+                    /* In order to attach hard disks we need to open a session
+                     * for the new machine */
                     rc = session.createInprocObject(CLSID_Session);
                     CheckComRCThrowRC(rc);
@@ -1912 +1913 @@
                                               pcszDstFilePath));
 
-                        // find the disk from the OVF's disk list
+                        /* Find the disk from the OVF's disk list */
                         DiskImagesMap::const_iterator itDiskImage = app->m->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. */
                         VirtualDisksMap::const_iterator itVirtualDisk = vsysThis.mapVirtualDisks.find(vsdeHD->strRef);
 
@@ -1933 +1934 @@
                         {
                             /* @todo: we have to create a new one */
+                            throw setError(E_FAIL,
+                                           tr("Creation of new disk images not supported yet."));
                         }
                         else
@@ -1943 +1946 @@
                              * attached already from a previous import) */
                             /* First open the existing disk image */
-                            ComPtr<IHardDisk2> srcHdVBox;
                             rc = app->mVirtualBox->OpenHardDisk2(Bstr(strSrcFilePath), srcHdVBox.asOutParam());
                             CheckComRCThrowRC(rc);
@@ -1966 +1968 @@
                             ComPtr<IMachine> sMachine;
                             rc = session->COMGETTER(Machine)(sMachine.asOutParam());
+                            CheckComRCThrowRC(rc);
                             Guid hdId;
                             rc = dstHdVBox->COMGETTER(Id)(hdId.asOutParam());;
@@ -1976 +1979 @@
                                 case HardDiskController::IDE: sbt = StorageBus_IDE; break;
                                 case HardDiskController::SATA: sbt = StorageBus_SATA; break;
-                                           //case HardDiskController::SCSI: sbt = StorageBus_SCSI; break; // @todo: not available yet
+                                //case HardDiskController::SCSI: sbt = StorageBus_SCSI; break; // @todo: not available yet
                                 default: break;
                             }
@@ -1990 +1993 @@
                 catch(HRESULT aRC)
                 {
-                    /* Unregister/Delete the failed machine */
-                    /* @todo: Not sure what to do when there are succesfully
+                    /* @todo: Not sure what to do when there are successfully
                        added disk images. Delete them also? For now we leave
                        them. */
+                    if (!srcHdVBox.isNull())
+                    {
+                        /* Close any open src disks */
+                        rc = srcHdVBox->Close();
+                        CheckComRCThrowRC(rc);
+                    }
                     if (!session.isNull())
                     {
@@ -2001 +2009 @@
                         CheckComRCThrowRC(rc);
                     }
+                    /* Unregister/Delete the failed machine */
                     ComPtr<IMachine> failedMachine;
                     rc = app->mVirtualBox->UnregisterMachine(newMachineId, failedMachine.asOutParam());