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

Timestamp:

May 12, 2010 2:08:52 PM (15 years ago)

Author:

vboxsync

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

61537

Message:

Main/OVF: fix IDE channel confusion introduced with earlier OVF two-channel IDE fix (trunk regression)

Location:

trunk/src/VBox/Main/include

Files:

• ApplianceImpl.h (modified) (1 diff)
• ApplianceImplPrivate.h (modified) (1 diff)
• ovfreader.h (modified) (2 diffs)

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

@@ -141 +141 @@
                                      uint32_t ulAddressOnParent,
                                      Bstr &controllerType,
-                                     int32_t &lChannel,
+                                     int32_t &lControllerPort,
                                      int32_t &lDevice);
 

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

@@ -127 +127 @@
     ComPtr<IMachine>    pMachine;
     Bstr                controllerType;
-    int32_t             lChannel;
-    int32_t             lDevice;
+    int32_t             lControllerPort;        // 0-29 for SATA
+    int32_t             lDevice;                // IDE: 0 or 1, otherwise 0 always
 };
 

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

@@ -217 +217 @@
                                         // a network adapter depending on the network name.
     iprt::MiniString strAddress;                 // "Device-specific. For an Ethernet adapter, this specifies the MAC address."
+    int32_t lAddress;                   // strAddress as an integer, if applicable.
     iprt::MiniString strAddressOnParent;         // "For a device, this specifies its location on the controller."
     iprt::MiniString strAllocationUnits;         // "Specifies the units of allocation used. For example, “byte * 2^20”."
@@ -262 +263 @@
             // treats it as a fourth class besides IDE, SATA, SCSI
 
-    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)
+    int32_t                 lAddress;           // value from OVF "Address" element
+    bool                    fPrimary;           // controller index; this is determined heuristically by the OVF reader and will
+                                                // be true for the first controller of this type (e.g. IDE primary ctler) or
+                                                // false for the next (e.g. IDE secondary ctler)
 
     HardDiskController()
         : idController(0),
-          ulAddress(0)
+          lAddress(0),
+          fPrimary(true)
     { }
 };