Changeset 24526 in vbox for trunk/src

Timestamp:

Nov 9, 2009 7:34:28 PM (15 years ago)

Author:

vboxsync

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

54630

Message:

OVF: fix import and export of floppy and DVD attachments broken by medium change; fix export progress bars for media with differencing images

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (16 diffs)
• idl/VirtualBox.xidl (modified) (3 diffs)
• include/ApplianceImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -28 +28 @@
 #include <iprt/sha.h>
 #include <iprt/manifest.h>
-
-#include "ovfreader.h"
 
 #include <VBox/param.h>
@@ -759 +757 @@
 struct MyHardDiskAttachment
 {
-    Guid    uuid;
-    ComPtr<IMachine> pMachine;
-    Bstr    controllerType;
-    int32_t lChannel;
-    int32_t lDevice;
+    Guid                uuid;
+    ComPtr<IMachine>    pMachine;
+    Bstr                controllerType;
+    int32_t             lChannel;
+    int32_t             lDevice;
 };
 
@@ -1474 +1472 @@
             if (vsdeHDCSATA.size() > 1)
                 throw setError(VBOX_E_FILE_ERROR,
-                               tr("Too many SATA controllers in OVF; VirtualBox only supports one"));
+                               tr("Too many SATA controllers in OVF; import facility only supports one"));
             if (vsdeHDCSATA.size() > 0)
             {
@@ -1496 +1494 @@
             if (vsdeHDCSCSI.size() > 1)
                 throw setError(VBOX_E_FILE_ERROR,
-                               tr("Too many SCSI controllers in OVF; VirtualBox only supports one"));
+                               tr("Too many SCSI controllers in OVF; import facility only supports one"));
             if (vsdeHDCSCSI.size() > 0)
             {
@@ -1682 +1680 @@
                         mhda.pMachine = pNewMachine;
 
-                        switch (hdc.system)
-                        {
-                            case HardDiskController::IDE:
-                                // For the IDE bus, the channel parameter can be either 0 or 1, to specify the primary
-                                // or secondary IDE controller, respectively. For the primary controller of the IDE bus,
-                                // the device number can be either 0 or 1, to specify the master or the slave device,
-                                // respectively. For the secondary IDE controller, the device number is always 1 because
-                                // the master device is reserved for the CD-ROM drive.
-                                mhda.controllerType = Bstr("IDE Controller");
-                                switch (vd.ulAddressOnParent)
-                                {
-                                    case 0:     // interpret this as primary master
-                                        mhda.lChannel = (long)0;
-                                        mhda.lDevice = (long)0;
-                                    break;
-
-                                    case 1:     // interpret this as primary slave
-                                        mhda.lChannel = (long)0;
-                                        mhda.lDevice = (long)1;
-                                    break;
-
-                                    case 2:     // interpret this as secondary slave
-                                        mhda.lChannel = (long)1;
-                                        mhda.lDevice = (long)1;
-                                    break;
-
-                                    default:
-                                        throw setError(VBOX_E_NOT_SUPPORTED,
-                                                       tr("Invalid channel %RI16 specified; IDE controllers support only 0, 1 or 2"), vd.ulAddressOnParent);
-                                    break;
-                                }
-                            break;
-
-                            case HardDiskController::SATA:
-                                mhda.controllerType = Bstr("SATA Controller");
-                                mhda.lChannel = (long)vd.ulAddressOnParent;
-                                mhda.lDevice = (long)0;
-                            break;
-
-                            case HardDiskController::SCSI:
-                                mhda.controllerType = Bstr("SCSI Controller");
-                                mhda.lChannel = (long)vd.ulAddressOnParent;
-                                mhda.lDevice = (long)0;
-                            break;
-
-                            default: break;
-                        }
+                        ConvertDiskAttachmentValues(hdc,
+                                                    vd.ulAddressOnParent,
+                                                    mhda.controllerType,        // Bstr
+                                                    mhda.lChannel,
+                                                    mhda.lDevice);
 
                         Log(("Attaching disk %s to channel %d on device %d\n", vsdeHD->strVbox.c_str(), mhda.lChannel, mhda.lDevice));
@@ -1762 +1718 @@
             }
 
-#if 0  // @todo Implement CD-ROM import for 3.1 final
             // Add CD-ROMs to the appropriate controllers.
             std::list<VirtualSystemDescriptionEntry*> vsdeCDROM = vsdescThis->findByType(VirtualSystemDescriptionType_CDROM);
@@ -1784 +1739 @@
                         ++it)
                     {
-                        VirtualSystemDescriptionEntry *pVSDE = *it;
-
-                        // @@todo
+                        // for now always attach to secondary master on IDE controller;
+                        // there seems to be no useful information in OVF where else to
+                        // attach it (@todo test with latest versions of OVF software)
+
+                        // find the IDE controller
+                        const HardDiskController *pController = NULL;
+                        for (ControllersMap::const_iterator it = vsysThis.mapControllers.begin();
+                             it != vsysThis.mapControllers.end();
+                             ++it)
+                        {
+                            if (it->second.system == HardDiskController::IDE)
+                            {
+                                pController = &it->second;
+                            }
+                        }
+
+                        if (!pController)
+                            throw setError(VBOX_E_FILE_ERROR,
+                                           tr("OVF wants a CD-ROM drive but cannot find IDE controller, which is required in this version of VirtualBox"));
+
+                        // this is for rollback later
+                        MyHardDiskAttachment mhda;
+                        mhda.uuid = newMachineId;
+                        mhda.pMachine = pNewMachine;
+
+                        ConvertDiskAttachmentValues(*pController,
+                                                    2,     // interpreted as secondary master
+                                                    mhda.controllerType,        // Bstr
+                                                    mhda.lChannel,
+                                                    mhda.lDevice);
+
+                        Log(("Attaching CD-ROM to channel %d on device %d\n", mhda.lChannel, mhda.lDevice));
+
+                        ComPtr<IMachine> sMachine;
+                        rc = session->COMGETTER(Machine)(sMachine.asOutParam());
+                        if (FAILED(rc)) throw rc;
+
+                        rc = sMachine->AttachDevice(mhda.controllerType,
+                                                    mhda.lChannel,
+                                                    mhda.lDevice,
+                                                    DeviceType_DVD,
+                                                    Bstr(""));
+                        if (FAILED(rc)) throw rc;
+
+                        llHardDiskAttachments.push_back(mhda);
+
+                        rc = sMachine->SaveSettings();
+                        if (FAILED(rc)) throw rc;
 
                     } // end for (itHD = avsdeHDs.begin();
@@ -1806 +1806 @@
                 }
             }
-#endif
         }
         catch(HRESULT aRC)
@@ -1881 +1880 @@
 
     return VINF_SUCCESS;
+}
+
+/**
+ * Helper that converts VirtualSystem attachment values into VirtualBox attachment values.
+ * Throws HRESULT values on errors!
+ *
+ * @param hdc
+ * @param vd
+ * @param mhda
+ */
+void Appliance::ConvertDiskAttachmentValues(const HardDiskController &hdc,
+                                            uint32_t ulAddressOnParent,
+                                            Bstr &controllerType,
+                                            int32_t &lChannel,
+                                            int32_t &lDevice)
+{
+    switch (hdc.system)
+    {
+        case HardDiskController::IDE:
+            // For the IDE bus, the channel parameter can be either 0 or 1, to specify the primary
+            // or secondary IDE controller, respectively. For the primary controller of the IDE bus,
+            // the device number can be either 0 or 1, to specify the master or the slave device,
+            // respectively. For the secondary IDE controller, the device number is always 1 because
+            // the master device is reserved for the CD-ROM drive.
+            controllerType = Bstr("IDE Controller");
+            switch (ulAddressOnParent)
+            {
+                case 0:     // interpret this as primary master
+                    lChannel = (long)0;
+                    lDevice = (long)0;
+                break;
+
+                case 1:     // interpret this as primary slave
+                    lChannel = (long)0;
+                    lDevice = (long)1;
+                break;
+
+                case 2:     // interpret this as secondary master
+                    lChannel = (long)1;
+                    lDevice = (long)0;
+                break;
+
+                case 3:     // interpret this as secondary slave
+                    lChannel = (long)1;
+                    lDevice = (long)1;
+                break;
+
+                default:
+                    throw setError(VBOX_E_NOT_SUPPORTED,
+                                    tr("Invalid channel %RI16 specified; IDE controllers support only 0, 1 or 2"), ulAddressOnParent);
+                break;
+            }
+        break;
+
+        case HardDiskController::SATA:
+            controllerType = Bstr("SATA Controller");
+            lChannel = (long)ulAddressOnParent;
+            lDevice = (long)0;
+        break;
+
+        case HardDiskController::SCSI:
+            controllerType = Bstr("SCSI Controller");
+            lChannel = (long)ulAddressOnParent;
+            lDevice = (long)0;
+        break;
+
+        default: break;
+    }
 }
 
@@ -3568 +3635 @@
 
             /* CD Drive */
-            /* @todo: I can't disable the CDROM. So nothing to do for now */
-            /*
             if (vsysThis.fHasCdromDrive)
-                pNewDesc->addEntry(VirtualSystemDescriptionType_CDROM, "", "", "");*/
+                pNewDesc->addEntry(VirtualSystemDescriptionType_CDROM, "", "", "");
 
             /* Hard disk Controller */
@@ -4320 +4385 @@
         uint32_t cCPUs;
         uint32_t ulMemSizeMB;
-        BOOL fDVDEnabled = FALSE;
-        BOOL fFloppyEnabled = FALSE;
         BOOL fUSBEnabled;
         BOOL fAudioEnabled;
@@ -4348 +4411 @@
         // snapshotFolder?
         // VRDPServer?
-
-/// @todo FIXME // @todo mediumbranch
-#if 0
-        // floppy
-        rc = mFloppyDrive->COMGETTER(Enabled)(&fFloppyEnabled);
-        if (FAILED(rc)) throw rc;
-
-        // CD-ROM ?!?
-        // ComPtr<IDVDDrive> pDVDDrive;
-        fDVDEnabled = 1;
-#endif
 
         // this is more tricky so use the COM method
@@ -4483 +4535 @@
 
 //     <const name="HardDiskImage" value="9" />
+//     <const name="Floppy" value="18" />
+//     <const name="CDROM" value="19" />
+
         MediaData::AttachmentList::iterator itA;
         for (itA = mMediaData->mAttachments.begin();
@@ -4502 +4557 @@
 
             StorageBus_T storageBus;
+            DeviceType_T deviceType;
             LONG lChannel;
             LONG lDevice;
@@ -4508 +4564 @@
             if (FAILED(rc)) throw rc;
 
+            rc = pHDA->COMGETTER(Type)(&deviceType);
+            if (FAILED(rc)) throw rc;
+
             rc = pHDA->COMGETTER(Medium)(pMedium.asOutParam());
             if (FAILED(rc)) throw rc;
@@ -4517 +4576 @@
             if (FAILED(rc)) throw rc;
 
-            Bstr bstrLocation;
-            Bstr bstrName;
-            if (pMedium) // @todo mediumbranch only for hard disks
+            Utf8Str strTargetVmdkName;
+            Utf8Str strLocation;
+            ULONG64 ullSize = 0;
+
+            if (    deviceType == DeviceType_HardDisk
+                 && pMedium
+               )
             {
+                Bstr bstrLocation;
                 rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
                 if (FAILED(rc)) throw rc;
+                strLocation = bstrLocation;
+
+                Bstr bstrName;
                 rc = pMedium->COMGETTER(Name)(bstrName.asOutParam());
                 if (FAILED(rc)) throw rc;
 
+                strTargetVmdkName = bstrName;
+                strTargetVmdkName.stripExt();
+                strTargetVmdkName.append(".vmdk");
+
+                // we need the size of the image so we can give it to addEntry();
+                // later, on export, the progress weight will be based on this.
+                // pMedium can be a differencing image though; in that case, we
+                // need to use the size of the base instead.
+                ComPtr<IMedium> pBaseMedium;
+                rc = pMedium->COMGETTER(Base)(pBaseMedium.asOutParam());
+                        // returns pMedium if there are no diff images
+                if (FAILED(rc)) throw rc;
+
                 // force reading state, or else size will be returned as 0
                 MediumState_T ms;
-                rc = pMedium->RefreshState(&ms);
+                rc = pBaseMedium->RefreshState(&ms);
                 if (FAILED(rc)) throw rc;
 
-                ULONG64 ullSize;
-                rc = pMedium->COMGETTER(Size)(&ullSize);
+                rc = pBaseMedium->COMGETTER(Size)(&ullSize);
                 if (FAILED(rc)) throw rc;
-
-                // and how this translates to the virtual system
-                int32_t lControllerVsys = 0;
-                LONG lChannelVsys;
-
-                switch (storageBus)
-                {
-                    case StorageBus_IDE:
-                        // this is the exact reverse to what we're doing in Appliance::taskThreadImportMachines,
-                        // and it must be updated when that is changed!
-
-                        if (lChannel == 0 && lDevice == 0)      // primary master
-                            lChannelVsys = 0;
-                        else if (lChannel == 0 && lDevice == 1) // primary slave
-                            lChannelVsys = 1;
-                        else if (lChannel == 1 && lDevice == 1) // secondary slave; secondary master is always CDROM
-                            lChannelVsys = 2;
-                        else
-                            throw setError(VBOX_E_NOT_SUPPORTED,
-                                        tr("Cannot handle hard disk attachment: channel is %d, device is %d"), lChannel, lDevice);
-
-                        lControllerVsys = lIDEControllerIndex;
-                    break;
-
-                    case StorageBus_SATA:
-                        lChannelVsys = lChannel;        // should be between 0 and 29
-                        lControllerVsys = lSATAControllerIndex;
-                    break;
-
-                    case StorageBus_SCSI:
-                        lChannelVsys = lChannel;        // should be between 0 and 15
-                        lControllerVsys = lSCSIControllerIndex;
-                    break;
-
-                    default:
+            }
+
+            // and how this translates to the virtual system
+            int32_t lControllerVsys = 0;
+            LONG lChannelVsys;
+
+            switch (storageBus)
+            {
+                case StorageBus_IDE:
+                    // this is the exact reverse to what we're doing in Appliance::taskThreadImportMachines,
+                    // and it must be updated when that is changed!
+
+                    if (lChannel == 0 && lDevice == 0)      // primary master
+                        lChannelVsys = 0;
+                    else if (lChannel == 0 && lDevice == 1) // primary slave
+                        lChannelVsys = 1;
+                    else if (lChannel == 1 && lDevice == 0) // secondary master; by default this is the CD-ROM but as of VirtualBox 3.1 that can change
+                        lChannelVsys = 2;
+                    else if (lChannel == 1 && lDevice == 1) // secondary slave
+                        lChannelVsys = 3;
+                    else
                         throw setError(VBOX_E_NOT_SUPPORTED,
-                                    tr("Cannot handle hard disk attachment: storageBus is %d, channel is %d, device is %d"), storageBus, lChannel, lDevice);
-                    break;
-                }
-
-                Utf8Str strTargetVmdkName(bstrName);
-                strTargetVmdkName.stripExt();
-                strTargetVmdkName.append(".vmdk");
-
-                pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskImage,
-                                strTargetVmdkName,   // disk ID: let's use the name
-                                strTargetVmdkName,   // OVF value:
-                                Utf8Str(bstrLocation), // vbox value: media path
-                                (uint32_t)(ullSize / _1M),
-                                Utf8StrFmt("controller=%RI32;channel=%RI32", lControllerVsys, lChannelVsys));
+                                    tr("Cannot handle medium attachment: channel is %d, device is %d"), lChannel, lDevice);
+
+                    lControllerVsys = lIDEControllerIndex;
+                break;
+
+                case StorageBus_SATA:
+                    lChannelVsys = lChannel;        // should be between 0 and 29
+                    lControllerVsys = lSATAControllerIndex;
+                break;
+
+                case StorageBus_SCSI:
+                    lChannelVsys = lChannel;        // should be between 0 and 15
+                    lControllerVsys = lSCSIControllerIndex;
+                break;
+
+                case StorageBus_Floppy:
+                    lChannelVsys = 0;
+                    lControllerVsys = 0;
+                break;
+
+                default:
+                    throw setError(VBOX_E_NOT_SUPPORTED,
+                                tr("Cannot handle medium attachment: storageBus is %d, channel is %d, device is %d"), storageBus, lChannel, lDevice);
+                break;
+            }
+
+            Utf8StrFmt strExtra("controller=%RI32;channel=%RI32", lControllerVsys, lChannelVsys);
+            Utf8Str strEmpty;
+
+            switch (deviceType)
+            {
+                case DeviceType_HardDisk:
+                    Log(("Adding VirtualSystemDescriptionType_HardDiskImage, disk size: %RI64\n", ullSize));
+                    pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskImage,
+                                       strTargetVmdkName,   // disk ID: let's use the name
+                                       strTargetVmdkName,   // OVF value:
+                                       strLocation, // vbox value: media path
+                                       (uint32_t)(ullSize / _1M),
+                                       strExtra);
+                break;
+
+                case DeviceType_DVD:
+                    pNewDesc->addEntry(VirtualSystemDescriptionType_CDROM,
+                                       strEmpty,   // disk ID
+                                       strEmpty,   // OVF value
+                                       strEmpty, // vbox value
+                                       1,           // ulSize
+                                       strExtra);
+                break;
+
+                case DeviceType_Floppy:
+                    pNewDesc->addEntry(VirtualSystemDescriptionType_Floppy,
+                                       strEmpty,      // disk ID
+                                       strEmpty,      // OVF value
+                                       strEmpty,      // vbox value
+                                       1,       // ulSize
+                                       strExtra);
+                break;
             }
         }
-
-        /* Floppy Drive */
-        if (fFloppyEnabled)  // @todo mediumbranch
-            pNewDesc->addEntry(VirtualSystemDescriptionType_Floppy, "", "", "");
-
-        /* CD Drive */
-        if (fDVDEnabled) // @todo mediumbranch
-            pNewDesc->addEntry(VirtualSystemDescriptionType_CDROM, "", "", "");
 
 //     <const name="NetworkAdapter" />

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

@@ -3523 +3523 @@
       </li>
       <li>
+         "CDROM": a virtual CD-ROM drive. The matching item in aExtraConfigValue[] contains the same
+         attachment information as with "HardDiskImage" items.
+      </li>
+      <li>
+        "CDROM": a virtual floppy drive. The matching item in aExtraConfigValue[] contains the same
+        attachment information as with "HardDiskImage" items.
+      </li>
+      <li>
         "NetworkAdapter": a network adapter. The array item in aVBoxValues[] will specify the hardware
         for the network adapter, whereas the array item in aExtraConfigValues[] will have a string
@@ -5807 +5815 @@
         <desc>
           Size of buffer allocated by caller. If the buffer is too small,
-          the method fails. 
+          the method fails.
         </desc>
       </param>
@@ -5877 +5885 @@
         <desc>
           Size of buffer allocated by caller. If the buffer is too small,
-          the method fails. 
+          the method fails.
         </desc>
       </param>

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

@@ -28 +28 @@
 #include "VirtualBoxBase.h"
 
+#include "ovfreader.h"
+
 /* VBox forward declarations */
 class VirtualBox;
@@ -117 +119 @@
     int importS3(TaskImportOVF *pTask);
 
+    void ConvertDiskAttachmentValues(const HardDiskController &hdc,
+                                     uint32_t ulAddressOnParent,
+                                     Bstr &controllerType,
+                                     int32_t &lChannel,
+                                     int32_t &lDevice);
+
     HRESULT writeImpl(int aFormat, const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);