Changeset 59553 in vbox

Timestamp:

Feb 2, 2016 2:00:18 AM (9 years ago)

Author:

vboxsync

Message:

ovfreader.cpp: Adjusted AHCI acceptance weirdness so it can handle tdAppliance1-t4.ova and left a @todo on a weird 'Caption' check.

File:

• trunk/src/VBox/Main/xml/ovfreader.cpp (modified) (2 diffs)

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -662 +662 @@
                             <rasd:BusNumber>0</rasd:BusNumber>
                         </Item> */
-                        if (    i.strCaption.startsWith("sataController", RTCString::CaseInsensitive)
-                             && !i.strResourceSubType.compare("AHCI", RTCString::CaseInsensitive)
-                           )
+                        if (   (   i.strCaption.startsWith("sataController", RTCString::CaseInsensitive) /** @todo r=bird: 'Caption' sounds user settable so this looks plain wrong. tdAppliance1-t4.ova has an empty caption. */
+                                && i.strResourceSubType.compare("AHCI", RTCString::CaseInsensitive) == 0)
+                            || i.strResourceSubType.compare("vmware.sata.ahci", RTCString::CaseInsensitive) == 0)
                         {
                             HardDiskController hdc;
@@ -674 +674 @@
                         }
                         else
-                            throw OVFLogicError(N_("Error reading \"%s\": Host resource of type \"Other Storage Device (%d)\" is supported with SATA AHCI controllers only, line %d"),
+                            throw OVFLogicError(N_("Error reading \"%s\": Host resource of type \"Other Storage Device (%d)\" is supported with SATA AHCI controllers only, line %d (caption:%s; subtype:%s)"),
                                                 m_strPath.c_str(),
                                                 ResourceType_OtherStorageDevice,
-                                                i.ulLineNumber);
+                                                i.ulLineNumber, i.strCaption.c_str(), i.strResourceSubType.c_str() );
                         break;
                     }