Changeset 28531 in vbox for trunk/src/VBox/Main/include

Timestamp:

Apr 20, 2010 4:22:41 PM (15 years ago)

Author:

vboxsync

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

60336

Message:

Main/OVF: fix import of IDE controllers (export currently broken)

File:

• trunk/src/VBox/Main/include/ovfreader.h (modified) (2 diffs)

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

@@ -256 +256 @@
 struct HardDiskController
 {
-    uint32_t            idController;           // instance ID (Item/InstanceId); this gets referenced from HardDisk
+    uint32_t                idController;       // instance ID (Item/InstanceId); this gets referenced from VirtualDisk
+
     enum ControllerSystemType { IDE, SATA, SCSI };
-    ControllerSystemType system;                 // one of IDE, SATA, SCSI
-    iprt::MiniString    strControllerType;      // controller subtype (Item/ResourceSubType); e.g. "LsiLogic"; can be empty (esp. for IDE)
-    iprt::MiniString    strAddress;             // for IDE
-    uint32_t            ulBusNumber;            // for IDE
+    ControllerSystemType    system;             // one of IDE, SATA, SCSI
+
+    iprt::MiniString        strControllerType;  // controller subtype (Item/ResourceSubType); e.g. "LsiLogic"; can be empty (esp. for IDE)
+
+    uint32_t                ulAddress;          // controller index; this is determined heuristically by the OVF reader and will
+                                                // be 0 for the first controller of this type (e.g. IDE primary ctler), 1 for the
+                                                // next (e.g. IDE secondary ctler)
 
     HardDiskController()
         : idController(0),
-          ulBusNumber(0)
-    {
-    }
+          ulAddress(0)
+    { }
 };
 
@@ -275 +278 @@
 {
     uint32_t            idController;           // SCSI (or IDE) controller this disk is connected to;
+                                                // this must match HardDiskController.idController and
                                                 // points into VirtualSystem.mapControllers
     uint32_t            ulAddressOnParent;      // parsed strAddressOnParent of hardware item; will be 0 or 1 for IDE