Changeset 28596 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 22, 2010 2:02:59 PM (15 years ago)

Author:

vboxsync

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

60441

Message:

Main/OVF: fix IDE controller export broken by r60336

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (2 diffs)
• ApplianceImplExport.cpp (modified) (7 diffs)
• ApplianceImplImport.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/ApplianceImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1244 +1244 @@
 void VirtualSystemDescription::addEntry(VirtualSystemDescriptionType_T aType,
                                         const Utf8Str &strRef,
-                                        const Utf8Str &aOrigValue,
-                                        const Utf8Str &aAutoValue,
+                                        const Utf8Str &aOvfValue,
+                                        const Utf8Str &aVboxValue,
                                         uint32_t ulSizeMB,
                                         const Utf8Str &strExtraConfig /*= ""*/)
@@ -1253 +1253 @@
     vsde.type = aType;
     vsde.strRef = strRef;
-    vsde.strOvf = aOrigValue;
-    vsde.strVbox = aAutoValue;
+    vsde.strOvf = aOvfValue;
+    vsde.strVbox = aVboxValue;
     vsde.strExtraConfig = strExtraConfig;
     vsde.ulSizeMB = ulSizeMB;

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -222 +222 @@
                 lIDEControllerPrimaryIndex = (int32_t)pNewDesc->m->llDescriptions.size();
                 pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerIDE,
-                                   Utf8StrFmt("%d", lIDEControllerPrimaryIndex),
-                                   strVbox,
-                                   strVbox);
+                                   Utf8StrFmt("%d", lIDEControllerPrimaryIndex),        // strRef
+                                   strVbox,     // aOvfValue
+                                   strVbox);    // aVboxValue
                 lIDEControllerSecondaryIndex = lIDEControllerPrimaryIndex + 1;
                 pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerIDE,
@@ -664 +664 @@
                                             XMLStack &stack)
 {
+    LogFlowFunc(("ENTER appliance %p\n", this));
+
     xml::ElementNode *pelmVirtualSystem;
     if (enFormat == OVF_0_9)
@@ -865 +867 @@
         {
             const VirtualSystemDescriptionEntry &desc = *itD;
+
+            LogFlowFunc(("Loop %u: handling description entry ulIndex=%u, type=%s, strRef=%s, strOvf=%s, strVbox=%s, strExtraConfig=%s\n",
+                         uLoop,
+                         desc.ulIndex,
+                         (  desc.type == VirtualSystemDescriptionType_HardDiskControllerIDE ? "HardDiskControllerIDE"
+                          : desc.type == VirtualSystemDescriptionType_HardDiskControllerSATA ? "HardDiskControllerSATA"
+                          : desc.type == VirtualSystemDescriptionType_HardDiskControllerSCSI ? "HardDiskControllerSCSI"
+                          : desc.type == VirtualSystemDescriptionType_HardDiskImage ? "HardDiskImage"
+                          : Utf8StrFmt("%d", desc.type).c_str()),
+                         desc.strRef.c_str(),
+                         desc.strOvf.c_str(),
+                         desc.strVbox.c_str(),
+                         desc.strExtraConfig.c_str()));
 
             ovf::ResourceType_T type = (ovf::ResourceType_T)0;      // if this becomes != 0 then we do stuff
@@ -944 +959 @@
                         strResourceSubType = desc.strVbox;
 
-                        if (desc.strRef != "1")
+                        if (!lIDEPrimaryControllerIndex)
                         {
                             // first IDE controller:
@@ -1063 +1078 @@
                         size_t pos1 = desc.strExtraConfig.find("controller=");
                         size_t pos2 = desc.strExtraConfig.find("channel=");
+                        int32_t lControllerIndex = -1;
                         if (pos1 != Utf8Str::npos)
                         {
-                            int32_t lControllerIndex = -1;
                             RTStrToInt32Ex(desc.strExtraConfig.c_str() + pos1 + 11, NULL, 0, &lControllerIndex);
                             if (lControllerIndex == lIDEPrimaryControllerIndex)
@@ -1078 +1093 @@
                         if (pos2 != Utf8Str::npos)
                             RTStrToInt32Ex(desc.strExtraConfig.c_str() + pos2 + 8, NULL, 0, &lAddressOnParent);
+
+                        LogFlowFunc(("HardDiskImage details: pos1=%d, pos2=%d, lControllerIndex=%d, lIDEPrimaryControllerIndex=%d, lIDESecondaryControllerIndex=%d, ulParent=%d, lAddressOnParent=%d\n",
+                                     pos1, pos2, lControllerIndex, lIDEPrimaryControllerIndex, lIDESecondaryControllerIndex, ulParent, lAddressOnParent));
 
                         if (    !ulParent
@@ -1293 +1311 @@
 HRESULT Appliance::writeFS(const LocationInfo &locInfo, const OVFFormat enFormat, ComObjPtr<Progress> &pProgress)
 {
-    LogFlowFuncEnter();
-    LogFlowFunc(("Appliance %p\n", this));
+    LogFlowFunc(("ENTER appliance %p\n", this));
 
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -395 +395 @@
                 {
                     case ovf::HardDiskController::IDE:
+                        /* Check for the constrains */
+                        if (cIDEused < 4)
                         {
-                            /* Check for the constrains */
-                            /* @todo: I'm very confused! Are these bits *one* controller or
-                               is every port/bus declared as an extra controller. */
-                            if (cIDEused < 4)
-                            {
-                                // @todo: figure out the IDE types
-                                /* Use PIIX4 as default */
-                                Utf8Str strType = "PIIX4";
-                                if (!hdc.strControllerType.compare("PIIX3", Utf8Str::CaseInsensitive))
-                                    strType = "PIIX3";
-                                else if (!hdc.strControllerType.compare("ICH6", Utf8Str::CaseInsensitive))
-                                    strType = "ICH6";
-                                pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerIDE,
-                                                   strControllerID,
-                                                   hdc.strControllerType,
-                                                   strType);
-                            }
-                            else
-                            {
-                                /* Warn only once */
-                                if (cIDEused == 1)
-                                    addWarning(tr("The virtual \"%s\" system requests support for more than one IDE controller, but VirtualBox has support for only one."),
-                                               vsysThis.strName.c_str());
-
-                            }
-                            ++cIDEused;
-                            break;
+                            // @todo: figure out the IDE types
+                            /* Use PIIX4 as default */
+                            Utf8Str strType = "PIIX4";
+                            if (!hdc.strControllerType.compare("PIIX3", Utf8Str::CaseInsensitive))
+                                strType = "PIIX3";
+                            else if (!hdc.strControllerType.compare("ICH6", Utf8Str::CaseInsensitive))
+                                strType = "ICH6";
+                            pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerIDE,
+                                               strControllerID,         // strRef
+                                               hdc.strControllerType,   // aOvfValue
+                                               strType);                // aVboxValue
                         }
+                        else
+                            /* Warn only once */
+                            if (cIDEused == 2)
+                                addWarning(tr("The virtual \"%s\" system requests support for more than two IDE controller channels, but VirtualBox supports only two."),
+                                            vsysThis.strName.c_str());
+
+                        ++cIDEused;
+                    break;
 
                     case ovf::HardDiskController::SATA:

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

@@ -3534 +3534 @@
       <li>
         "HardDiskControllerIDE": an IDE hard disk controller. There can be at most two such items.
-        This has no value in @a aOvfValues[] or @a aVBoxValues[].
+        An optional value in @a aOvfValues[] and @a aVBoxValues[] can be "PIIX3" or "PIIX4" to specify
+        the type of IDE controller; this corresponds to the ResourceSubType element which VirtualBox
+        writes into the OVF.
         The matching item in the @a aRefs[] array will contain an integer that items of the "Harddisk"
         type can use to specify which hard disk controller a virtual disk should be connected to.
@@ -8618 +8620 @@
           data. Pass 0 for an infinite timeout.
         </desc>
-      </param>     
+      </param>
       <param name="size" type="unsigned long long" dir="in">
         <desc>

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

@@ -260 +260 @@
     void addEntry(VirtualSystemDescriptionType_T aType,
                   const Utf8Str &strRef,
-                  const Utf8Str &aOrigValue,
-                  const Utf8Str &aAutoValue,
+                  const Utf8Str &aOvfValue,
+                  const Utf8Str &aVboxValue,
                   uint32_t ulSizeMB = 0,
                   const Utf8Str &strExtraConfig = "");