Changeset 16228 in vbox

Timestamp:

Jan 26, 2009 1:11:42 PM (16 years ago)

Author:

vboxsync

Message:

OVF: handle IDE controllers

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -125 +125 @@
 {
     uint32_t             idController;           // instance ID (Item/InstanceId); this gets referenced from HardDisk
-    ControllerSystemType controllerSystem;       // @todo: figure out of OVF (IDE;SATA;SCSI)
-    string               strControllerType;      // controller type (Item/ResourceSubType); e.g. "LsiLogic"
+    ControllerSystemType controllerSystem;       // one of IDE, SATA, SCSI
+    string               strControllerType;      // controller type (Item/ResourceSubType); e.g. "LsiLogic"; can be empty (esp. for IDE)
+    string               strAddress;             // for IDE
+    uint32_t             ulBusNumber;            // for IDE
+
+    HardDiskController()
+        : idController(0),
+          ulBusNumber(0)
+    {
+    }
 };
 
@@ -585 +593 @@
                     break;
 
+                    case OVFResourceType_IdeController:          // 5       IdeController
+                    {
+                        /*  <Item>
+                                <rasd:Caption>ideController0</rasd:Caption>
+                                <rasd:Description>IDE Controller</rasd:Description>
+                                <rasd:InstanceId>5</rasd:InstanceId>
+                                <rasd:ResourceType>5</rasd:ResourceType>
+                                <rasd:Address>0</rasd:Address>
+                                <rasd:BusNumber>0</rasd:BusNumber>
+                            </Item> */
+                        HardDiskController hdc;
+                        hdc.idController = i.ulInstanceID;
+                        hdc.controllerSystem = IDE;
+                        hdc.strAddress = i.strAddress;
+                        hdc.ulBusNumber = i.ulBusNumber;
+
+                        d.mapControllers[i.ulInstanceID] = hdc;
+                    }
+
                     case OVFResourceType_ParallelScsiHba:        // 6       SCSI controller
                     {

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

@@ -2860 +2860 @@
     <const name="Processor" value="3" />
     <const name="Memory" value="4" />
-    <const name="IdeCController" value="5" />
+    <const name="IdeController" value="5" />
     <const name="ParallelScsiHba" value="6" />
     <const name="FcHba" value="7" />