Changeset 17868 in vbox

Timestamp:

Mar 14, 2009 3:59:29 PM (16 years ago)

Author:

vboxsync

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

44422

Message:

OVF: fixed exporting of SATA & SCSI controllers

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2626 +2626 @@
                         break;
 
-//                         case VirtualSystemDescriptionType_HardDiskControllerSATA:       // @todo
-//                         break;
+                        case VirtualSystemDescriptionType_HardDiskControllerSATA:
+                            /*  <Item>
+                                    <rasd:Caption>sataController0</rasd:Caption>
+                                    <rasd:Description>SATA Controller</rasd:Description>
+                                    <rasd:InstanceId>4</rasd:InstanceId>
+                                    <rasd:ResourceType>20</rasd:ResourceType>
+                                    <rasd:ResourceSubType>ahci</rasd:ResourceSubType>
+                                    <rasd:Address>0</rasd:Address>
+                                    <rasd:BusNumber>0</rasd:BusNumber>
+                                </Item>
+                            */
+                            if (uLoop == 1)
+                            {
+                                strDescription = "SATA Controller";
+                                strCaption = "sataController0";
+                                type = OVFResourceType_OtherStorageDevice; // 20
+                                // it seems that OVFTool always writes these two, and since we can only
+                                // have one SATA controller, we'll use this as well
+                                lAddress = 0;
+                                lBusNumber = 0;
+
+                                if (    desc.strVbox.isEmpty()      // AHCI is the default in VirtualBox
+                                     || (!desc.strVbox.compare("ahci", Utf8Str::CaseInsensitive))
+                                   )
+                                    strResourceSubType = "AHCI";
+                                else
+                                    throw setError(VBOX_E_NOT_SUPPORTED,
+                                                   tr("Invalid config string \"%s\" in SATA controller"), desc.strVbox.c_str());
+
+                                // remember this ID
+                                idSATAController = ulInstanceID;
+                                lSATAControllerIndex = lIndexThis;
+                            }
+                        break;
 
                         case VirtualSystemDescriptionType_HardDiskControllerSCSI:
@@ -3412 +3444 @@
 #ifdef VBOX_WITH_AHCI
 //     <const name="HardDiskControllerSATA" value="7" />
-        rc = GetStorageControllerByName(Bstr("IDE"), pController.asOutParam());
-        strVbox = "";
+        rc = GetStorageControllerByName(Bstr("SATA"), pController.asOutParam());
+        strVbox = "AHCI";
         if (SUCCEEDED(rc))
         {
@@ -3514 +3546 @@
                 break;
 
-//                 case StorageBus::SCSI:
-//                         // mhda.busType = StorageBus_SCSI;
-//                     throw setError(VBOX_E_NOT_SUPPORTED,
-//                                 tr("SCSI controller support is not available yet in VirtualBox"));
-//                         // @todo
-//                 break;
+                case StorageBus::SCSI:
+                    lChannelVsys = lChannel;        // should be between 0 and 15
+                    lControllerVsys = lSCSIControllerIndex;
+                break;
 
                 default:

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

@@ -2972 +2972 @@
     <const name="DvdDrive" value="16" />
     <const name="HardDisk" value="17" />
+    <const name="OtherStorageDevice" value="20" />
     <const name="UsbController" value="23" />
     <const name="SoundCard" value="35" />
@@ -3171 +3172 @@
           see <link to="IAppliance" /> for an overview.
 
-          Since importing the appliance will most probably involve copying and converting
+          Since exporting the appliance will most probably involve copying and converting
           disk images, which can take a long time, this method operates asynchronously and
           returns an IProgress object to allow the caller to monitor the progress.