Changeset 60998 in vbox for trunk/src/VBox/Main/xml

Timestamp:

May 17, 2016 11:36:44 AM (9 years ago)

Author:

vboxsync

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

107249

Message:

Main/xml/ovfreader.cpp: Fix OVF parsing of AHCI controller definition. Must not look at <caption>, because that tag is user defined content.

File:

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

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -662 +662 @@
                             <rasd:BusNumber>0</rasd:BusNumber>
                         </Item> */
-                        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)
+                        if (   i.strResourceSubType.compare("AHCI", RTCString::CaseInsensitive) == 0
                             || i.strResourceSubType.compare("vmware.sata.ahci", RTCString::CaseInsensitive) == 0)
                         {
@@ -674 +673 @@
                         }
                         else
-                            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)"),
+                            throw OVFLogicError(N_("Error reading \"%s\": Host resource of type \"Other Storage Device (%d)\" is supported with SATA AHCI controllers only, line %d (subtype:%s)"),
                                                 m_strPath.c_str(),
                                                 ResourceType_OtherStorageDevice,
-                                                i.ulLineNumber, i.strCaption.c_str(), i.strResourceSubType.c_str() );
+                                                i.ulLineNumber, i.strResourceSubType.c_str() );
                         break;
                     }