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

Timestamp:

Aug 13, 2009 9:25:03 AM (15 years ago)

Author:

vboxsync

Message:

Main: improve XML error messages

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (39 diffs)

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

@@ -121 +121 @@
 
         if (!(m->pelmRoot->getAttributeValue("version", m->strSettingsVersionFull)))
-            throw ConfigFileError(this, N_("Required VirtualBox/version attribute is missing"));
+            throw ConfigFileError(this, N_("Required VirtualBox/@version attribute is missing"));
 
         m->sv = SettingsVersion_Null;
@@ -308 +308 @@
                 map[strName] = strValue;
             else
-                throw ConfigFileError(this, N_("ExtraDataItem element must have name and value attributes"));
+                throw ConfigFileError(this, N_("Required ExtraDataItem/@name or @value attribute is missing"));
         }
         else
-            throw ConfigFileError(this, N_("Invalid element %s in ExtraData section"), pelmExtraDataItem->getName());
+            throw ConfigFileError(this, N_("Invalid element '%s' in ExtraData section"), pelmExtraDataItem->getName());
     }
 }
@@ -357 +357 @@
                     flt.action = USBDeviceFilterAction_Hold;
                 else
-                    throw ConfigFileError(this, N_("Invalid value %s in DeviceFilter/action attribute"), strAction.c_str());
+                    throw ConfigFileError(this, N_("Invalid value '%s' in DeviceFilter/@action attribute"), strAction.c_str());
             }
 
@@ -532 +532 @@
             }
             else
-                throw ConfigFileError(this, N_("MachineEntry element must have uuid and src attributes"));
-        }
-        else
-            throw ConfigFileError(this, N_("Invalid element %s in MachineRegistry section"), pelmChild1->getName());
+                throw ConfigFileError(this, N_("Required MachineEntry/@uuid or @src attribute is missing"));
+        }
     }
 }
@@ -562 +560 @@
         {
             if (!(elmMedium.getAttributeValue("format", med.strFormat)))
-                throw ConfigFileError(this, N_("HardDisk element must have format attribute"));
+                throw ConfigFileError(this, N_("Required HardDisk/@format attribute is missing"));
 
             if (!(elmMedium.getAttributeValue("autoReset", med.fAutoReset)))
@@ -577 +575 @@
                     med.hdType = HardDiskType_Writethrough;
                 else
-                    throw ConfigFileError(this, N_("HardDisk/type attribute must be one of Normal, Immutable or Writethrough"));
+                    throw ConfigFileError(this, N_("HardDisk/@type attribute must be one of Normal, Immutable or Writethrough"));
             }
         }
@@ -601 +599 @@
                     med.properties[strPropName] = strPropValue;
                 else
-                    throw ConfigFileError(this, N_("HardDisk/Property element must have name and value attributes"));
+                    throw ConfigFileError(this, N_("Required HardDisk/Property/@name or @value attribute is missing"));
             }
         }
@@ -608 +606 @@
     }
     else
-        throw ConfigFileError(this, N_("%s element must have uuid and location attributes"), elmMedium.getName());
+        throw ConfigFileError(this, N_("Required %s/@uuid or @location attribute is missing"), elmMedium.getName());
 }
 
@@ -617 +615 @@
 void MainConfigFile::readMediaRegistry(const xml::ElementNode &elmMediaRegistry)
 {
-    // <MachineEntry uuid="{ xxx }" src="   xxx "/>
     xml::NodesLoop nl1(elmMediaRegistry);
     const xml::ElementNode *pelmChild1;
@@ -630 +627 @@
             t = FloppyImage;
         else
-            throw ConfigFileError(this, N_("Invalid element %s in MediaRegistry section"), pelmChild1->getName());
+            continue;
 
         xml::NodesLoop nl1(*pelmChild1);
@@ -680 +677 @@
                 llDhcpServers.push_back(srv);
             else
-                throw ConfigFileError(this, N_("DHCPServer element must have networkName, IPAddress, networkMask, lowerIP, upperIP and enabled attributes"));
-        }
-        else
-            throw ConfigFileError(this, N_("Invalid element %s in DHCPServers section"), pelmServer->getName());
+                throw ConfigFileError(this, N_("Required DHCPServer/@networkName, @IPAddress, @networkMask, @lowerIP, @upperIP or @enabled attribute is missing"));
+        }
     }
 }
@@ -740 +735 @@
                             if (pelmLevel4Child->nameEquals("DHCPServers"))
                                 readDHCPServers(*pelmLevel4Child);
-                            else
-                                throw ConfigFileError(this, N_("Invalid element %s in NetserviceRegistry section"), pelmLevel4Child->getName());
                         }
                     }
                     else if (pelmGlobalChild->nameEquals("USBDeviceFilters"))
                         readUSBDeviceFilters(*pelmGlobalChild, host.llUSBDeviceFilters);
-                    else
-                        throw ConfigFileError(this, N_("Invalid element %s in Global section"), pelmGlobalChild->getName());
                 }
             } // end if (pelmRootChild->nameEquals("Global"))
@@ -950 +941 @@
 
         if (!pelmAdapter->getAttributeValue("slot", nic.ulSlot))
-            throw ConfigFileError(this, N_("Required Adapter/slot attribute is missing"));
+            throw ConfigFileError(this, N_("Required Adapter/@slot attribute is missing"));
 
         Utf8Str strTemp;
@@ -966 +957 @@
                 nic.type = NetworkAdapterType_I82545EM;
             else
-                throw ConfigFileError(this, N_("Invalid value %s in Adapter/type attribute"), strTemp.c_str());
+                throw ConfigFileError(this, N_("Invalid value '%s' in Adapter/type attribute"), strTemp.c_str());
         }
 
@@ -993 +984 @@
             nic.mode = NetworkAttachmentType_Internal;
             if (!pelmAdapterChild->getAttributeValue("name", nic.strName))    // required network name
-                throw ConfigFileError(this, N_("Required 'name' element is missing under 'InternalNetwork' element"));
+                throw ConfigFileError(this, N_("Required InternalNetwork/name element is missing"));
         }
         else if ((pelmAdapterChild = pelmAdapter->findChildElement("HostOnlyInterface")))
@@ -999 +990 @@
             nic.mode = NetworkAttachmentType_HostOnly;
             if (!pelmAdapterChild->getAttributeValue("name", nic.strName))    // required network name
-                throw ConfigFileError(this, N_("Required 'name' element is missing under 'HostOnlyInterface' element"));
+                throw ConfigFileError(this, N_("Required HostOnlyInterface/name element is missing"));
         }
         // else: default is NetworkAttachmentType_Null
@@ -1021 +1012 @@
         SerialPort port;
         if (!pelmPort->getAttributeValue("slot", port.ulSlot))
-            throw ConfigFileError(this, N_("Required UART/Port/slot attribute is missing"));
+            throw ConfigFileError(this, N_("Required UART/Port/@slot attribute is missing"));
 
         // slot must be unique
@@ -1028 +1019 @@
              ++it)
             if ((*it).ulSlot == port.ulSlot)
-                throw ConfigFileError(this, N_("UART/Port/slot attribute value %d is used twice, must be unique"), port.ulSlot);
+                throw ConfigFileError(this, N_("UART/Port/@slot attribute value %d is used twice, must be unique"), port.ulSlot);
 
         if (!pelmPort->getAttributeValue("enabled", port.fEnabled))
-            throw ConfigFileError(this, N_("Required UART/Port/enabled attribute is missing"));
+            throw ConfigFileError(this, N_("Required UART/Port/@enabled attribute is missing"));
         if (!pelmPort->getAttributeValue("IOBase", port.ulIOBase))
-            throw ConfigFileError(this, N_("Required UART/Port/IOBase attribute is missing"));
+            throw ConfigFileError(this, N_("Required UART/Port/@IOBase attribute is missing"));
         if (!pelmPort->getAttributeValue("IRQ", port.ulIRQ))
-            throw ConfigFileError(this, N_("Required UART/Port/IRQ attribute is missing"));
+            throw ConfigFileError(this, N_("Required UART/Port/@IRQ attribute is missing"));
 
         Utf8Str strPortMode;
         if (!pelmPort->getAttributeValue("hostMode", strPortMode))
-            throw ConfigFileError(this, N_("Required UART/Port/hostMode attribute is missing"));
+            throw ConfigFileError(this, N_("Required UART/Port/@hostMode attribute is missing"));
         if (strPortMode == "RawFile")
             port.portMode = PortMode_RawFile;
@@ -1049 +1040 @@
             port.portMode = PortMode_Disconnected;
         else
-            throw ConfigFileError(this, N_("Invalid value %s in UART/Port/hostMode attribute"), strPortMode.c_str());
+            throw ConfigFileError(this, N_("Invalid value '%s' in UART/Port/@hostMode attribute"), strPortMode.c_str());
 
         pelmPort->getAttributeValue("path", port.strPath);
@@ -1072 +1063 @@
         ParallelPort port;
         if (!pelmPort->getAttributeValue("slot", port.ulSlot))
-            throw ConfigFileError(this, N_("Required LPT/Port/slot attribute is missing"));
+            throw ConfigFileError(this, N_("Required LPT/Port/@slot attribute is missing"));
 
         // slot must be unique
@@ -1079 +1070 @@
              ++it)
             if ((*it).ulSlot == port.ulSlot)
-                throw ConfigFileError(this, N_("LPT/Port/slot attribute value %d is used twice, must be unique"), port.ulSlot);
+                throw ConfigFileError(this, N_("LPT/Port/@slot attribute value %d is used twice, must be unique"), port.ulSlot);
 
         if (!pelmPort->getAttributeValue("enabled", port.fEnabled))
-            throw ConfigFileError(this, N_("Required LPT/Port/enabled attribute is missing"));
+            throw ConfigFileError(this, N_("Required LPT/Port/@enabled attribute is missing"));
         if (!pelmPort->getAttributeValue("IOBase", port.ulIOBase))
-            throw ConfigFileError(this, N_("Required LPT/Port/IOBase attribute is missing"));
+            throw ConfigFileError(this, N_("Required LPT/Port/@IOBase attribute is missing"));
         if (!pelmPort->getAttributeValue("IRQ", port.ulIRQ))
-            throw ConfigFileError(this, N_("Required LPT/Port/IRQ attribute is missing"));
+            throw ConfigFileError(this, N_("Required LPT/Port/@IRQ attribute is missing"));
 
         pelmPort->getAttributeValue("path", port.strPath);
@@ -1181 +1172 @@
                 Utf8Str strDevice;
                 if (!pelmOrder->getAttributeValue("position", ulPos))
-                    throw ConfigFileError(this, N_("'Order' element lacks 'position' attribute"));
+                    throw ConfigFileError(this, N_("Required Order/@position attribute is missing"));
                 if (!pelmOrder->getAttributeValue("device", strDevice))
-                    throw ConfigFileError(this, N_("'Order' element lacks 'device' attribute"));
+                    throw ConfigFileError(this, N_("Required Order/@device attribute is missing"));
                 if (hw.mapBootOrder.find(ulPos) != hw.mapBootOrder.end())
-                    throw ConfigFileError(this, N_("Value %d of 'position' attribute in 'Order' element is not unique"), ulPos);
+                    throw ConfigFileError(this, N_("Order/@attribute value %d is not unique"), ulPos);
 
                 DeviceType_T type;
@@ -1199 +1190 @@
                     type = DeviceType_Network;
                 else
-                    throw ConfigFileError(this, N_("Invalid value %s in Boot/Order/device attribute"), strDevice.c_str());
+                    throw ConfigFileError(this, N_("Invalid value '%s' in Boot/Order/@device attribute"), strDevice.c_str());
                 hw.mapBootOrder[ulPos] = type;
             }
@@ -1226 +1217 @@
                     hw.vrdpSettings.authType = VRDPAuthType_External;
                 else
-                    throw ConfigFileError(this, N_("Invalid value %s in RemoteDisplay/authType attribute"), strAuthType.c_str());
+                    throw ConfigFileError(this, N_("Invalid value '%s' in RemoteDisplay/@authType attribute"), strAuthType.c_str());
             }
 
@@ -1259 +1250 @@
                         hw.biosSettings.biosBootMenuMode = BIOSBootMenuMode_MessageAndMenu;
                     else
-                        throw ConfigFileError(this, N_("Invalid value %s in BootMenu/mode attribute"), strBootMenuMode.c_str());
+                        throw ConfigFileError(this, N_("Invalid value '%s' in BootMenu/@mode attribute"), strBootMenuMode.c_str());
                 }
             }
@@ -1286 +1277 @@
                         sctl.controllerType = StorageControllerType_ICH6;
                     else
-                        throw ConfigFileError(this, N_("Invalid value %s for IDEController/type attribute"), strType.c_str());
+                        throw ConfigFileError(this, N_("Invalid value '%s' for IDEController/@type attribute"), strType.c_str());
                 }
                 sctl.ulPortCount = 2;
@@ -1361 +1352 @@
                     hw.audioAdapter.controllerType = AudioControllerType_AC97;
                 else
-                    throw ConfigFileError(this, N_("Invalid value %s in AudioAdapter/controller attribute"), strTemp.c_str());
+                    throw ConfigFileError(this, N_("Invalid value '%s' in AudioAdapter/@controller attribute"), strTemp.c_str());
             }
             if (pelmHwChild->getAttributeValue("driver", strTemp))
@@ -1384 +1375 @@
                     hw.audioAdapter.driverType = AudioDriverType_MMPM;
                 else
-                    throw ConfigFileError(this, N_("Invalid value %s in AudioAdapter/driver attribute"), strTemp.c_str());
+                    throw ConfigFileError(this, N_("Invalid value '%s' in AudioAdapter/@driver attribute"), strTemp.c_str());
             }
         }
@@ -1414 +1405 @@
                     hw.clipboardMode = ClipboardMode_Bidirectional;
                 else
-                    throw ConfigFileError(this, N_("Invalid value %s in Clipbord/mode attribute"), strTemp.c_str());
+                    throw ConfigFileError(this, N_("Invalid value '%s' in Clipbord/@mode attribute"), strTemp.c_str());
             }
         }
@@ -1425 +1416 @@
             readGuestProperties(*pelmHwChild, hw);
         else
-            throw ConfigFileError(this, N_("Invalid element %s in Hardware section"), pelmHwChild->getName());
+            throw ConfigFileError(this, N_("Invalid element '%s' in Hardware section"), pelmHwChild->getName());
     }
 
     if (hw.ulMemorySizeMB == (uint32_t)-1)
-        throw ConfigFileError(this, N_("Required Memory/RAMSize element/attribute is missing"));
+        throw ConfigFileError(this, N_("Required Memory/@RAMSize element/attribute is missing"));
 }
 
@@ -1466 +1457 @@
 
         if (!pelmAttachment->getAttributeValue("hardDisk", strUUID))
-            throw ConfigFileError(this, N_("Required HardDiskAttachment/hardDisk attribute is missing"));
+            throw ConfigFileError(this, N_("Required HardDiskAttachment/@hardDisk attribute is missing"));
         parseUUID(att.uuid, strUUID);
 
         if (!pelmAttachment->getAttributeValue("bus", strBus))
-            throw ConfigFileError(this, N_("Required HardDiskAttachment/bus attribute is missing"));
+            throw ConfigFileError(this, N_("Required HardDiskAttachment/@bus attribute is missing"));
         // pre-1.7 'channel' is now port
         if (!pelmAttachment->getAttributeValue("channel", att.lPort))
-            throw ConfigFileError(this, N_("Required HardDiskAttachment/channel attribute is missing"));
+            throw ConfigFileError(this, N_("Required HardDiskAttachment/@channel attribute is missing"));
         // pre-1.7 'device' is still device
         if (!pelmAttachment->getAttributeValue("device", att.lDevice))
-            throw ConfigFileError(this, N_("Required HardDiskAttachment/device attribute is missing"));
+            throw ConfigFileError(this, N_("Required HardDiskAttachment/@device attribute is missing"));
 
         if (strBus == "IDE")
         {
             if (!pIDEController)
-                throw ConfigFileError(this, N_("HardDiskAttachment/bus is 'IDE' but cannot find IDE controller"));
+                throw ConfigFileError(this, N_("HardDiskAttachment/@bus is 'IDE' but cannot find IDE controller"));
             pIDEController->llAttachedDevices.push_back(att);
         }
@@ -1487 +1478 @@
         {
             if (!pSATAController)
-                throw ConfigFileError(this, N_("HardDiskAttachment/bus is 'SATA' but cannot find SATA controller"));
+                throw ConfigFileError(this, N_("HardDiskAttachment/@bus is 'SATA' but cannot find SATA controller"));
             pSATAController->llAttachedDevices.push_back(att);
         }
         else
-            throw ConfigFileError(this, N_("HardDiskAttachment/bus attribute has illegal value '%s'"), strBus.c_str());
+            throw ConfigFileError(this, N_("HardDiskAttachment/@bus attribute has illegal value '%s'"), strBus.c_str());
     }
 }
@@ -1515 +1506 @@
 
         if (!pelmController->getAttributeValue("name", sctl.strName))
-            throw ConfigFileError(this, N_("Required StorageController/name attribute is missing"));
+            throw ConfigFileError(this, N_("Required StorageController/@name attribute is missing"));
         Utf8Str strType;
         if (!pelmController->getAttributeValue("type", strType))
-            throw ConfigFileError(this, N_("Required StorageController/type attribute is missing"));
+            throw ConfigFileError(this, N_("Required StorageController/@type attribute is missing"));
 
         if (strType == "AHCI")
@@ -1551 +1542 @@
         }
         else
-            throw ConfigFileError(this, N_("Invalid value %s for StorageController/type attribute"), strType.c_str());
+            throw ConfigFileError(this, N_("Invalid value '%s' for StorageController/@type attribute"), strType.c_str());
 
         readStorageControllerAttributes(*pelmController, sctl);
@@ -1563 +1554 @@
             Utf8Str strTemp;
             pelmAttached->getAttributeValue("type", strTemp);
-            if (strTemp != "HardDisk")
-                throw ConfigFileError(this, N_("AttachedDevice element must have 'HardDisk' type"));
-
-            const xml::ElementNode *pelmImage;
-            if (!(pelmImage = pelmAttached->findChildElement("Image")))
-                throw ConfigFileError(this, N_("Required AttachedDevice/Image element is missing"));
-
-            if (!pelmImage->getAttributeValue("uuid", strTemp))
-                throw ConfigFileError(this, N_("Required AttachedDevice/Image/uuid attributeis missing"));
-            parseUUID(att.uuid, strTemp);
-
-            if (!pelmAttached->getAttributeValue("port", att.lPort))
-                throw ConfigFileError(this, N_("Required AttachedDevice/port attribute is missing"));
-            if (!pelmAttached->getAttributeValue("device", att.lDevice))
-                throw ConfigFileError(this, N_("Required AttachedDevice/device attribute is missing"));
-
-            sctl.llAttachedDevices.push_back(att);
+            // ignore everything but HardDisk entries for forward compatibility
+            if (strTemp == "HardDisk")
+            {
+                const xml::ElementNode *pelmImage;
+                if (!(pelmImage = pelmAttached->findChildElement("Image")))
+                    throw ConfigFileError(this, N_("Required AttachedDevice/Image element is missing"));
+
+                if (!pelmImage->getAttributeValue("uuid", strTemp))
+                    throw ConfigFileError(this, N_("Required AttachedDevice/Image/@uuid attribute is missing"));
+                parseUUID(att.uuid, strTemp);
+
+                if (!pelmAttached->getAttributeValue("port", att.lPort))
+                    throw ConfigFileError(this, N_("Required AttachedDevice/@port attribute is missing"));
+                if (!pelmAttached->getAttributeValue("device", att.lDevice))
+                    throw ConfigFileError(this, N_("Required AttachedDevice/@device attribute is missing"));
+
+                sctl.llAttachedDevices.push_back(att);
+            }
         }
 
@@ -1603 +1595 @@
 
     if (!elmSnapshot.getAttributeValue("uuid", strTemp))
-        throw ConfigFileError(this, N_("Required Snapshot/uuid attribute is missing"));
+        throw ConfigFileError(this, N_("Required Snapshot/@uuid attribute is missing"));
     parseUUID(snap.uuid, strTemp);
 
     if (!elmSnapshot.getAttributeValue("name", snap.strName))
-        throw ConfigFileError(this, N_("Required Snapshot/name attribute is missing"));
+        throw ConfigFileError(this, N_("Required Snapshot/@name attribute is missing"));
 
     elmSnapshot.getAttributeValue("Description", snap.strDescription);
 
     if (!elmSnapshot.getAttributeValue("timeStamp", strTemp))
-        throw ConfigFileError(this, N_("Required Snapshot/timeStamp attribute is missing"));
+        throw ConfigFileError(this, N_("Required Snapshot/@timeStamp attribute is missing"));
     parseTimestamp(snap.timestamp, strTemp);
 
@@ -1620 +1612 @@
     const xml::ElementNode *pelmHardware;
     if (!(pelmHardware = elmSnapshot.findChildElement("Hardware")))
-        throw ConfigFileError(this, N_("Required Snapshot/Hardware element is missing"));
+        throw ConfigFileError(this, N_("Required Snapshot/@Hardware element is missing"));
     readHardware(*pelmHardware, snap.hardware, snap.storage);
 
@@ -1649 +1641 @@
                     snap.llChildSnapshots.push_back(child);
                 }
-                else
-                    throw ConfigFileError(this, N_("Invalid element %s under Snapshots element"), pelmChildSnapshot->getName());
             }
         }
-        else if (pelmSnapshotChild->nameEquals("Hardware"))
-            ; // handled above
-        else
-            throw ConfigFileError(this, N_("Invalid element %s under Snapshot element"), pelmSnapshotChild->getName());
     }
 }
@@ -1720 +1706 @@
             else if (pelmMachineChild->nameEquals("Description"))
                 strDescription = pelmMachineChild->getValue();
-            else if (pelmMachineChild->nameEquals("Hardware"))
-                ; // read above
-            else
-                throw ConfigFileError(this, N_("Invalid element %s under Machine element"), pelmMachineChild->getName());
         }
     }
     else
-        throw ConfigFileError(this, N_("Machine element must have uuid and name attributes"));
+        throw ConfigFileError(this, N_("Required Machine/@uuid or @name attributes is missing"));
 }