Changeset 16517 in vbox

Timestamp:

Feb 4, 2009 4:25:29 PM (16 years ago)

Author:

vboxsync

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

42441

Message:

OVF: add IVirtualSystemDescription::disableItem(), fix disk import

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageImport.cpp (modified) (2 diffs)
• Main/ApplianceImpl.cpp (modified) (25 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/ApplianceImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -54 +54 @@
 
     Utf8Str strOvfFilename;
+    bool fExecute = false;                  // if true, then we actually do the import (-exec argument)
 
     for (int i = 0; i < a->argc; i++)
     {
-        if (!strOvfFilename)
+        if (!strcmp(a->argv[i], "-exec"))
+            fExecute = true;
+        else if (!strOvfFilename)
             strOvfFilename = a->argv[i];
         else
@@ -219 +222 @@
                 }
             }
-            RTPrintf("\n");
-        }
+
+            if (fExecute)
+            {
+                ComPtr<IProgress> progress;
+                CHECK_ERROR_BREAK(appliance,
+                                  ImportAppliance(progress.asOutParam()));
+
+                showProgress(progress);
+
+                if (SUCCEEDED(rc))
+                {
+                    progress->COMGETTER(ResultCode)(&rc);
+                    if (FAILED (rc))
+                    {
+                        com::ProgressErrorInfo info(progress);
+                        if (info.isBasicAvailable())
+                            RTPrintf("Error: failed to import appliance. Error message: %lS\n", info.getText().raw());
+                        else
+                            RTPrintf("Error: failed to import appliance. No error message available!\n");
+                    }
+                    else
+                        RTPrintf("Successfully imported the appliance.\n");
+                }
+            }
+        } // end if (aVirtualSystemDescriptions.size() > 0)
     } while (0);
 

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -226 +226 @@
     ss << val;
     return Utf8Str(ss.str().c_str());
+}
+
+static Utf8Str stripFilename(const Utf8Str &strFile)
+{
+    Utf8Str str2(strFile);
+    RTPathStripFilename(str2.mutableRaw());
+    return str2;
 }
 
@@ -433 +440 @@
                             pelmDisk->getLineNumber());
 
-        // RTPrintf("  found disk: %s\n", d.strDiskId.c_str());
         m->mapDisks[d.strDiskId] = d;
     }
@@ -1428 +1434 @@
                                                   pController->ulIndex);
                         pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskImage,
-                                           "",
+                                           hd.strDiskId,
                                            di.strHref,
                                            strPath,
@@ -1498 +1504 @@
     char *tmpName = RTStrDup(aName.c_str());
     int i = 1;
-    /* @todo: Maybe to cost intensive; try to find a lighter way */
+    /* @todo: Maybe too cost-intensive; try to find a lighter way */
     while (mVirtualBox->FindMachine(Bstr(tmpName), &machine) != VBOX_E_OBJECT_NOT_FOUND)
     {
@@ -1518 +1524 @@
     /* Check if the file exists or if a file with this path is registered
      * already */
-    /* @todo: Maybe to cost intensive; try to find a lighter way */
+    /* @todo: Maybe too cost-intensive; try to find a lighter way */
     while (RTPathExists(tmpName) ||
            mVirtualBox->FindHardDisk2(Bstr(tmpName), &harddisk) != VBOX_E_OBJECT_NOT_FOUND)
@@ -1527 +1533 @@
         char *tmpFile = RTStrDup(RTPathFilename(aName.c_str()));
         RTPathStripExt(tmpFile);
-        char *tmpExt = RTPathExt(aName.c_str());
+        const char *tmpExt = RTPathExt(aName.c_str());
         RTStrAPrintf(&tmpName, "%s/%s_%d%s", tmpDir, tmpFile, i, tmpExt);
         RTStrFree(tmpFile);
@@ -1580 +1586 @@
             std::list<VirtualSystemDescriptionEntry*> vsdeOS = vsdescThis->findByType(VirtualSystemDescriptionType_OS);
             Assert(vsdeOS.size() == 1);
-            const Utf8Str &osTypeVBox = vsdeOS.front()->strConfig;
+            const Utf8Str &strOsTypeVBox = vsdeOS.front()->strConfig;
 
             /* Now that we know the base system get our internal defaults based on that. */
             ComPtr<IGuestOSType> osType;
-            rc = app->mVirtualBox->GetGuestOSType(Bstr(osTypeVBox), osType.asOutParam());
+            rc = app->mVirtualBox->GetGuestOSType(Bstr(strOsTypeVBox), osType.asOutParam());
             CheckComRCThrowRC(rc);
 
@@ -1591 +1597 @@
             std::list<VirtualSystemDescriptionEntry*> vsdeName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
             Assert(vsdeName.size() == 1);
-            const Utf8Str &nameVBox = vsdeName.front()->strConfig;
-            ComPtr<IMachine> newMachine;
-            rc = app->mVirtualBox->CreateMachine(Bstr(nameVBox.c_str()), Bstr(osTypeVBox.c_str()),
+            const Utf8Str &strNameVBox = vsdeName.front()->strConfig;
+            ComPtr<IMachine> pNewMachine;
+            rc = app->mVirtualBox->CreateMachine(Bstr(strNameVBox), Bstr(strOsTypeVBox),
                                                  Bstr(), Guid(),
-                                                 newMachine.asOutParam());
+                                                 pNewMachine.asOutParam());
             CheckComRCThrowRC(rc);
 
@@ -1609 +1615 @@
             uint64_t tt = RTStrToUInt64(memoryVBox.c_str()) / _1M;
 
-            rc = newMachine->COMSETTER(MemorySize)(tt);
+            rc = pNewMachine->COMSETTER(MemorySize)(tt);
             CheckComRCThrowRC(rc);
 
@@ -1619 +1625 @@
             CheckComRCThrowRC(rc);
             /* Set the VRAM */
-            rc = newMachine->COMSETTER(VRAMSize)(vramVBox);
+            rc = pNewMachine->COMSETTER(VRAMSize)(vramVBox);
             CheckComRCThrowRC(rc);
 
@@ -1632 +1638 @@
                     uint32_t audio = RTStrToUInt32(audioAdapterVBox.c_str());
                     ComPtr<IAudioAdapter> audioAdapter;
-                    rc = newMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam());
+                    rc = pNewMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam());
                     CheckComRCThrowRC(rc);
                     rc = audioAdapter->COMSETTER(Enabled)(true);
@@ -1670 +1676 @@
             /* USB Controller */
             std::list<VirtualSystemDescriptionEntry*> vsdeUSBController = vsdescThis->findByType(VirtualSystemDescriptionType_USBController);
-            /* If there is no USB controller entry it will be disabled */
+            // USB support is enabled if there's at least one such entry; to disable USB support,
+            // the type of the USB item would have been changed to "ignore"
             bool fUSBEnabled = vsdeUSBController.size() > 0;
-            if (fUSBEnabled)
-            {
-                /* Check if the user has disabled the USB controller in the client */
-                const Utf8Str& usbVBox = vsdeUSBController.front()->strConfig;
-                fUSBEnabled = usbVBox == "1";
-            }
+
             ComPtr<IUSBController> usbController;
-            rc = newMachine->COMGETTER(USBController)(usbController.asOutParam());
+            rc = pNewMachine->COMGETTER(USBController)(usbController.asOutParam());
             CheckComRCThrowRC(rc);
             rc = usbController->COMSETTER(Enabled)(fUSBEnabled);
@@ -1690 +1692 @@
                 /* No network adapters, so we have to disable our default one */
                 ComPtr<INetworkAdapter> nwVBox;
-                rc = newMachine->GetNetworkAdapter(0, nwVBox.asOutParam());
+                rc = pNewMachine->GetNetworkAdapter(0, nwVBox.asOutParam());
                 CheckComRCThrowRC(rc);
                 rc = nwVBox->COMSETTER(Enabled)(false);
@@ -1699 +1701 @@
                 list<VirtualSystemDescriptionEntry*>::const_iterator nwIt;
                 /* Iterate through all network cards. We support 8 network adapters
-                 * at the maximum. (@todo: warn if it are more!) */
+                 * at the maximum. (@todo: warn if there are more!) */
                 size_t a = 0;
                 for (nwIt = vsdeNW.begin();
@@ -1708 +1710 @@
                     uint32_t tt1 = RTStrToUInt32(nwTypeVBox.c_str());
                     ComPtr<INetworkAdapter> nwVBox;
-                    rc = newMachine->GetNetworkAdapter((ULONG)a, nwVBox.asOutParam());
+                    rc = pNewMachine->GetNetworkAdapter((ULONG)a, nwVBox.asOutParam());
                     CheckComRCThrowRC(rc);
                     /* Enable the network card & set the adapter type */
@@ -1721 +1723 @@
             /* Floppy drive */
             std::list<VirtualSystemDescriptionEntry*> vsdeFloppy = vsdescThis->findByType(VirtualSystemDescriptionType_Floppy);
-            /* If there is no floppy drive entry it will be disabled */
+            // Floppy support is enabled if there's at least one such entry; to disable floppy support,
+            // the type of the floppy item would have been changed to "ignore"
             bool fFloppyEnabled = vsdeFloppy.size() > 0;
-            if (fFloppyEnabled)
-            {
-                /* Check if the user has disabled the floppy drive in the client */
-                const Utf8Str& floppyVBox = vsdeFloppy.front()->strConfig;
-                fFloppyEnabled = floppyVBox == "1";
-            }
             ComPtr<IFloppyDrive> floppyDrive;
-            rc = newMachine->COMGETTER(FloppyDrive)(floppyDrive.asOutParam());
+            rc = pNewMachine->COMGETTER(FloppyDrive)(floppyDrive.asOutParam());
             CheckComRCThrowRC(rc);
             rc = floppyDrive->COMSETTER(Enabled)(fFloppyEnabled);
@@ -1744 +1741 @@
             if (vsdeHDCIDE.size() > 0)
             {
-                IDEControllerType_T hdcVBox = static_cast<IDEControllerType_T>(RTStrToUInt32(vsdeHDCIDE.front()->strConfig.c_str()));
-                /* Set the appropriate IDE controller in the virtual BIOS of the
-                 * VM. */
+                // set the appropriate IDE controller in the virtual BIOS of the VM
                 ComPtr<IBIOSSettings> biosSettings;
-                rc = newMachine->COMGETTER(BIOSSettings)(biosSettings.asOutParam());
+                rc = pNewMachine->COMGETTER(BIOSSettings)(biosSettings.asOutParam());
                 CheckComRCThrowRC(rc);
-                rc = biosSettings->COMSETTER(IDEControllerType)(hdcVBox);
+                const char *pcszIDEType = vsdeHDCIDE.front()->strConfig.c_str();
+                if (!strcmp(pcszIDEType, "PIIX3"))
+                    rc = biosSettings->COMSETTER(IDEControllerType)(IDEControllerType_PIIX3);
+                else if (!strcmp(pcszIDEType, "PIIX4"))
+                    rc = biosSettings->COMSETTER(IDEControllerType)(IDEControllerType_PIIX4);
+                else
+                    throw setError(VBOX_E_FILE_ERROR,
+                                   tr("Invalid IDE controller type \"%s\""),
+                                   pcszIDEType);
                 CheckComRCThrowRC(rc);
             }
@@ -1764 +1767 @@
                     /* For now we have just to enable the AHCI controller. */
                     ComPtr<ISATAController> hdcSATAVBox;
-                    rc = newMachine->COMGETTER(SATAController)(hdcSATAVBox.asOutParam());
+                    rc = pNewMachine->COMGETTER(SATAController)(hdcSATAVBox.asOutParam());
                     CheckComRCThrowRC(rc);
                     rc = hdcSATAVBox->COMSETTER(Enabled)(true);
@@ -1775 +1778 @@
             }
 #endif /* VBOX_WITH_AHCI */
-#ifdef VBOX_WITH_SCSI
+
             /* Hard disk controller SCSI */
-            EntriesList vsdeHDCSCSI = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskControllerSCSI);
+            std::list<VirtualSystemDescriptionEntry*> vsdeHDCSCSI = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskControllerSCSI);
             /* @todo: do we support more than one SCSI controller? */
             if (vsdeHDCSCSI.size() > 0)
             {
-                /* @todo: Currently I have no idea how to enable this. Someone has
-                 * to write main support for SCSI at all. */
+                /* @todo: revisit when Main support for SCSI is ready */
             }
-#endif /* VBOX_WITH_SCSI */
 
             /* Now its time to register the machine before we add any hard disks */
-            rc = app->mVirtualBox->RegisterMachine(newMachine);
+            rc = app->mVirtualBox->RegisterMachine(pNewMachine);
             CheckComRCThrowRC(rc);
 
@@ -1798 +1799 @@
             {
                 Guid newMachineId;
-                rc = newMachine->COMGETTER(Id)(newMachineId.asOutParam());
+                rc = pNewMachine->COMGETTER(Id)(newMachineId.asOutParam());
                 CheckComRCThrowRC(rc);
                 /* If in the next block an error occur we have to deregister
@@ -1805 +1806 @@
                 try
                 {
-                    /* That we can 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);
@@ -1815 +1815 @@
                     /* The disk image has to be on the same place as the OVF file. So
                      * strip the filename out of the full file path. */
-                    char *pszSrcDir = RTStrDup(Utf8Str(app->m->bstrPath).raw());
-                    RTPathStripFilename(pszSrcDir);
-                    Utf8Str strSrcDir(pszSrcDir);
-                    RTStrFree(pszSrcDir);
+                    Utf8Str strSrcDir = stripFilename(Utf8Str(app->m->bstrPath).raw());
 
                     /* Iterate over all given disk images */
@@ -1831 +1828 @@
                         /* Check if the destination file exists already or the
                          * destination path is empty. */
-                        if (RTPathExists(pcszDstFilePath) ||
-                            !RTStrCmp(pcszDstFilePath, ""))
-                        {
+                        if (    !(*pcszDstFilePath)
+                             || RTPathExists(pcszDstFilePath)
+                           )
                             /* This isn't allowed */
                             throw setError(VBOX_E_FILE_ERROR,
                                            tr("Destination file '%s' exists",
                                               pcszDstFilePath));
-                        }
 
                         // 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
                         VirtualDisksMap::const_iterator itVirtualDisk = vsysThis.mapVirtualDisks.find(vsdeHD->strRef);
 
@@ -2048 +2046 @@
 }
 
+STDMETHODIMP VirtualSystemDescription::DisableItem(ULONG index)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    list<VirtualSystemDescriptionEntry>::iterator it;
+    for (it = m->descriptions.begin();
+         it != m->descriptions.end();
+         ++it)
+    {
+        VirtualSystemDescriptionEntry &e = *it;
+        if (e.ulIndex == index)
+        {
+            e.type = VirtualSystemDescriptionType_Ignore;
+            return S_OK;
+        }
+    }
+
+    return setError(VBOX_E_OBJECT_NOT_FOUND,
+                    tr("Array item index %d not found"),
+                    index);
+}
+
 STDMETHODIMP VirtualSystemDescription::SetFinalValues(ComSafeArrayIn(IN_BSTR, aFinalValues))
 {
@@ -2125 +2148 @@
     return NULL;
 }
+

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3118 +3118 @@
     </method>
 
+    <method name="disableItem">
+      <desc>
+        Disables part of the configuration, as represented by the array items returned by
+        <link to="getDescription" />. For example, to disable USB support for a given
+        virtual system, pass in the array item index of the USB controller; its type will
+        then be changed by this method from "USBController" to "Ignore".
+
+        This works only for items of the types HardDiskControllerIDE, HardDiskControllerSATA,
+        HardDiskControllerSCSI, HardDiskImage, CDROM, Floppy, NetworkAdapter, USBController
+        and SoundCard.
+      </desc>
+
+      <param name="index" type="unsigned long" dir="in">
+      </param>
+    </method>
+
     <method name="SetFinalValues">
       <desc></desc>

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

@@ -149 +149 @@
                               ComSafeArrayOut(BSTR, aConfigValues),
                               ComSafeArrayOut(BSTR, aExtraConfigValues));
+    STDMETHOD(DisableItem)(ULONG index);
     STDMETHOD(SetFinalValues)(ComSafeArrayIn(IN_BSTR, aFinalValues));