Changeset 16949 in vbox for trunk

Timestamp:

Feb 19, 2009 1:56:08 PM (16 years ago)

Author:

vboxsync

Message:

OVF: implement multiple channels per HD controller

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (3 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -149 +149 @@
     uint32_t            idController;           // SCSI (or IDE) controller this disk is connected to;
                                                 // points into VirtualSystem.mapControllers
+    uint32_t            ulAddressOnParent;      // parsed strAddressOnParent of hardware item; will be 0 or 1 for IDE
+                                                // and possibly higher for disks attached to SCSI controllers (untested)
     Utf8Str             strDiskId;              // if the hard disk has an ovf:/disk/<id> reference,
                                                 // this receives the <id> component; points to one of the
@@ -752 +754 @@
                         VirtualDisk vd;
                         vd.idController = i.ulParent;
+                        i.strAddressOnParent.toInt(vd.ulAddressOnParent);
                         bool fFound = false;
                         // ovf://disk/lamp
@@ -1513 +1516 @@
                                            tr("Internal inconsistency looking up hard disk controller."));
 
-                        /* controller to attach to @todo bus? */
-                        Utf8StrFmt strExtraConfig("controller=%RI16",
-                                                  pController->ulIndex);
+                        /* controller to attach to, and the bus within that controller */
+                        Utf8StrFmt strExtraConfig("controller=%RI16;channel=%RI16",
+                                                  pController->ulIndex,
+                                                  hd.ulAddressOnParent);
                         pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskImage,
                                            hd.strDiskId,
@@ -2103 +2107 @@
                         mhda.pMachine = pNewMachine;
                         mhda.busType = StorageBus_IDE;
-                        mhda.lChannel = (long)hdc.ulBusNumber; // ?!? @todo this is still wrong
-                        mhda.lDevice = (long)0;         // ?!? @todo this is still wrong
 
                         switch (hdc.system)
                         {
-                            case HardDiskController::IDE: mhda.busType = StorageBus_IDE; break;
-                            case HardDiskController::SATA: mhda.busType = StorageBus_SATA; break;
-                                                           //case HardDiskController::SCSI: sbt = StorageBus_SCSI; break; // @todo: not available yet
+                            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.
+                                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(VERR_NOT_IMPLEMENTED,
+                                                       tr("Invalid channel %RI16 specified; IDE conrollers support only 0, 1 or 2"), vd.ulAddressOnParent);
+                                    break;
+                                }
+                            break;
+
+                            case HardDiskController::SATA:
+                                mhda.busType = StorageBus_SATA;
+                                mhda.lChannel = (long)vd.ulAddressOnParent;
+                                mhda.lDevice = (long)0;
+                            break;
+
+                            case HardDiskController::SCSI:
+//                                 mhda.busType = StorageBus_SCSI;
+                                throw setError(VERR_NOT_IMPLEMENTED,
+                                               tr("SCSI controller support is not available yet in VirtualBox"));
+                                    // @ŧodo
+                            break;
+
                             default: break;
                         }
+
+                        Log(("Attaching disk %s to channel %d on device %d\n", pcszDstFilePath, mhda.lChannel, mhda.lDevice));
 
                         rc = sMachine->AttachHardDisk(hdId,

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

@@ -3082 +3082 @@
         "HarddiskControllerIDE": an IDE hard disk controller. There can be at most one such item. This
         has no value in aOrigValues[] or aConfigValues[].
-        The matching item in the aRefs[] array will contain an integer that other items of the "Harddisk"
+        The matching item in the aRefs[] array will contain an integer that items of the "Harddisk"
         type can use to specify which hard disk controller a virtual disk should be connected to.
       </li>
@@ -3098 +3098 @@
         "Harddisk": a virtual hard disk, most probably as a reference to an image file. There can be an
         arbitrary number of these items, one for each virtual disk image that accompanies the OVF. The
-        array item in aOrigValues[] will contain the file specification from the OVF file, whereas the item
-        in aConfigValues[] will contain a qualified path specification where the hard disk image should
-        be copied to; this target image will then be registered with VirtualBox.
-        The matching item in the aExtraConfigValues[] array must contain a string of the "controller=&lt;ctrl&gt;"
-        format, where &lt;ctrl&gt; must be an integer specifying the hard disk controller to connect the image to.
-        That number must be the index of an array item with one of the hard disk controller types
-        (HarddiskControllerSCSI, HarddiskControllerSATA, HarddiskControllerIDE).
+        array item in aOrigValues[] will contain the file specification from the OVF file, whereas the
+        item in aConfigValues[] will contain a qualified path specification to where the hard disk image
+        should be copied; this target image will then be registered with VirtualBox.
+        The matching item in the aExtraConfigValues[] array must contain a string of the following
+        format: "controller=&lt;index&gt;;channel=&lt;c&gt;"
+        In this string, &lt;index&gt; must be an integer specifying the hard disk controller to connect
+        the image to. That number must be the index of an array item with one of the hard disk controller
+        types (HarddiskControllerSCSI, HarddiskControllerSATA, HarddiskControllerIDE).
+        In addition, &lt;c&gt; must specify the channel to use on that controller. For IDE controllers,
+        this can range from 0-2 (which VirtualBox will interpret as primary master, primary slave,
+        secondary slave; VirtualBox reserves the secondary master for the CD-ROM drive). For SATA and
+        SCSI conrollers, the channel can range from 0-29.
       </li>
       <li>
@@ -6555 +6560 @@
       <desc>List of host tap interfaces currently defined on the host.</desc>
     </attribute>
-    
+
     <attribute name="processorCount" type="unsigned long" readonly="yes">
       <desc>Number of (logical) CPUs installed in the host system.</desc>