Changeset 17827 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Mar 13, 2009 2:14:08 PM (16 years ago)

Author:

vboxsync

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

44367

Message:

OVF: move warnings from IVirtualSystem to IAppliance; fix error messages when OVF wants more than one SCSI controller; API docs

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (17 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -198 +198 @@
 
     list< ComObjPtr<VirtualSystemDescription> > virtualSystemDescriptions; //
+
+    list<Utf8Str> llWarnings;
 };
 
@@ -203 +205 @@
 {
     list<VirtualSystemDescriptionEntry> llDescriptions;
-    list<Utf8Str> llWarnings;
 };
 
@@ -1276 +1277 @@
             if (cpuCountVBox > 1) //SchemaDefs::MaxCPUCount)
             {
-                pNewDesc->addWarning(tr("The virtual system claims support for %u CPU's, but VirtualBox has support for max %u CPU's only."),
-                                        cpuCountVBox, 1); //SchemaDefs::MaxCPUCount);
+                addWarning(tr("The virtual system \"%s\" claims support for %u CPU's, but VirtualBox has support for max %u CPU's only."),
+                           vsysThis.strName.c_str(), cpuCountVBox, 1); //SchemaDefs::MaxCPUCount);
                 cpuCountVBox = 1; //SchemaDefs::MaxCPUCount;
             }
@@ -1294 +1295 @@
                  ullMemSizeVBox > static_cast<uint64_t>(SchemaDefs::MaxGuestRAM)))
             {
-                pNewDesc->addWarning(tr("The virtual system claims support for %llu MB RAM size, but VirtualBox has support for min %u & max %u MB RAM size only."),
-                                        ullMemSizeVBox, SchemaDefs::MinGuestRAM, SchemaDefs::MaxGuestRAM);
+                addWarning(tr("The virtual system \"%s\" claims support for %llu MB RAM size, but VirtualBox has support for min %u & max %u MB RAM size only."),
+                              vsysThis.strName.c_str(), ullMemSizeVBox, SchemaDefs::MinGuestRAM, SchemaDefs::MaxGuestRAM);
                 ullMemSizeVBox = RT_MIN(RT_MAX(ullMemSizeVBox, static_cast<uint64_t>(SchemaDefs::MinGuestRAM)), static_cast<uint64_t>(SchemaDefs::MaxGuestRAM));
             }
@@ -1334 +1335 @@
                 /* Check for the constrains */
                 if (vsysThis.llNetworkNames.size() > SchemaDefs::NetworkAdapterCount)
-                    pNewDesc->addWarning(tr("The virtual system claims support for %u network adapters, but VirtualBox has support for max %u network adapter only."),
-                                         vsysThis.llNetworkNames.size(), SchemaDefs::NetworkAdapterCount);
+                    addWarning(tr("The virtual system \"%s\" claims support for %u network adapters, but VirtualBox has support for max %u network adapter only."),
+                                  vsysThis.strName.c_str(), vsysThis.llNetworkNames.size(), SchemaDefs::NetworkAdapterCount);
 
                 /* Get the default network adapter type for the selected guest OS */
@@ -1414 +1415 @@
                                 /* Warn only once */
                                 if (cIDEused == 1)
-                                    pNewDesc->addWarning(tr("The virtual system claims support for more than one IDE controller, but VirtualBox has support for only one."));
+                                    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());
 
                             }
@@ -1438 +1440 @@
                                 /* Warn only once */
                                 if (cSATAused == 1)
-                                    pNewDesc->addWarning(tr("The virtual system claims support for more than one SATA controller, but VirtualBox has support for only one."));
+                                    addWarning(tr("The virtual system \"%s\" requests support for more than one SATA controller, but VirtualBox has support for only one"),
+                                               vsysThis.strName.c_str());
 
                             }
@@ -1460 +1463 @@
                             }
                             else
-                            {
-                                /* Warn only once */
-                                if (cSCSIused == 1)
-                                    pNewDesc->addWarning(tr("The virtual system claims support for more than one SCSI controller, but VirtualBox has support for only one."));
-
-                            }
+                                addWarning(tr("The virtual system \"%s\" requests support for an additional SCSI controller of type \"%s\" with ID %s, but VirtualBox presently supports only one SCSI controller."),
+                                           vsysThis.strName.c_str(),
+                                           hdc.strControllerType.c_str(),
+                                           strControllerID.c_str());
                             ++cSCSIused;
                             break;
@@ -1508 +1509 @@
                         if (!(pController = pNewDesc->findControllerFromID(hd.idController)))
                             throw setError(E_FAIL,
-                                           tr("Internal inconsistency looking up hard disk controller."));
+                                           tr("Cannot find hard disk controller with OVF instance ID %RI32 to which disk \"%s\" should be attached"),
+                                           hd.idController,
+                                           di.strHref.c_str());
 
                         /* controller to attach to, and the bus within that controller */
@@ -1642 +1645 @@
 
     return rc;
+}
+
+/**
+* Public method implementation.
+ * @return
+ */
+STDMETHODIMP Appliance::GetWarnings(ComSafeArrayOut(BSTR, aWarnings))
+{
+    if (ComSafeArrayOutIsNull(aWarnings))
+        return E_POINTER;
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    com::SafeArray<BSTR> sfaWarnings(m->llWarnings.size());
+
+    list<Utf8Str>::const_iterator it;
+    size_t i = 0;
+    for (it = m->llWarnings.begin();
+         it != m->llWarnings.end();
+         ++it, ++i)
+    {
+        Bstr bstr = *it;
+        bstr.cloneTo(&sfaWarnings[i]);
+    }
+
+    sfaWarnings.detachTo(ComSafeArrayOutArg(aWarnings));
+
+    return S_OK;
 }
 
@@ -1713 +1747 @@
 
     return opCount;
+}
+
+void Appliance::addWarning(const char* aWarning, ...)
+{
+    va_list args;
+    va_start(args, aWarning);
+    Utf8StrFmtVA str(aWarning, args);
+    va_end(args);
+    m->llWarnings.push_back(str);
 }
 
@@ -2607 +2650 @@
                                 lBusNumber = 0;
 
-                                if (!desc.strVbox.compare("buslogic", Utf8Str::CaseInsensitive))
+                                if (    desc.strVbox.isEmpty()      // LsiLogic is the default in VirtualBox
+                                     || (!desc.strVbox.compare("lsilogic", Utf8Str::CaseInsensitive))
+                                   )
+                                    strResourceSubType = "lsilogic";
+                                else if (!desc.strVbox.compare("buslogic", Utf8Str::CaseInsensitive))
                                     strResourceSubType = "buslogic";
-                                else if (!desc.strVbox.compare("lsilogic", Utf8Str::CaseInsensitive))
-                                    strResourceSubType = "lsilogic";
                                 else
                                     throw setError(VBOX_E_NOT_SUPPORTED,
@@ -3123 +3168 @@
 
 /**
-* Public method implementation.
- * @return
- */
-STDMETHODIMP VirtualSystemDescription::GetWarnings(ComSafeArrayOut(BSTR, aWarnings))
-{
-    if (ComSafeArrayOutIsNull(aWarnings))
-        return E_POINTER;
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this);
-
-    com::SafeArray<BSTR> sfaWarnings(m->llWarnings.size());
-
-    list<Utf8Str>::const_iterator it;
-    size_t i = 0;
-    for (it = m->llWarnings.begin();
-         it != m->llWarnings.end();
-         ++it, ++i)
-    {
-        Bstr bstr = *it;
-        bstr.cloneTo(&sfaWarnings[i]);
-    }
-
-    sfaWarnings.detachTo(ComSafeArrayOutArg(aWarnings));
-
-    return S_OK;
-}
-
-/**
  * Internal method; adds a new description item to the member list.
  * @param aType Type of description for the new item.
@@ -3178 +3192 @@
 }
 
-void VirtualSystemDescription::addWarning(const char* aWarning, ...)
-{
-    va_list args;
-    va_start(args, aWarning);
-    Utf8StrFmtVA str(aWarning, args);
-    va_end(args);
-    m->llWarnings.push_back(str);
-}
-
 /**
  * Private method; returns a list of description items containing all the items from the member
@@ -3224 +3229 @@
          ++it)
     {
-        switch (it->type)
+        const VirtualSystemDescriptionEntry &d = *it;
+        switch (d.type)
         {
             case VirtualSystemDescriptionType_HardDiskControllerIDE:
             case VirtualSystemDescriptionType_HardDiskControllerSATA:
             case VirtualSystemDescriptionType_HardDiskControllerSCSI:
-                if (it->strRef == strRef)
-                    return &(*it);
+                if (d.strRef == strRef)
+                    return &d;
             break;
         }
@@ -3388 +3394 @@
 //     <const name="HardDiskControllerSATA" value="7" />
         rc = GetStorageControllerByName(Bstr("IDE"), pController.asOutParam());
+        strVbox = "";
         if (SUCCEEDED(rc))
         {
@@ -3400 +3407 @@
 //     <const name="HardDiskControllerSCSI" value="8" />
         rc = GetStorageControllerByName(Bstr("SCSI"), pController.asOutParam());
+        rc = pController->COMGETTER(ControllerType)(&ctlr);
+        if (FAILED(rc)) throw rc;
+        strVbox = "LsiLogic";       // the default in VBox
+        switch(ctlr)
+        {
+            case StorageControllerType_LsiLogic: strVbox = "LsiLogic"; break;
+            case StorageControllerType_BusLogic: strVbox = "BusLogic"; break;
+        }
         if (SUCCEEDED(rc))
         {