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

Timestamp:

Aug 17, 2009 3:36:01 PM (15 years ago)

Author:

vboxsync

Message:

Main/XML: add XML line numbers to error messages

File:

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

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

@@ -85 +85 @@
 {
 public:
-    ConfigFileError(const ConfigFileBase *file, const char *pcszFormat, ...)
+    ConfigFileError(const ConfigFileBase *file,
+                    const xml::Node *pNode,
+                    const char *pcszFormat, ...)
         : xml::LogicError()
     {
@@ -93 +95 @@
         va_end(args);
 
-        Utf8StrFmt str("Error reading %s. %s", file->m->strFilename.c_str(), what.c_str());
+        Utf8Str strLine;
+        if (pNode)
+            strLine = Utf8StrFmt(" (line %RU32)", pNode->getLineNumber());
+
+        Utf8StrFmt str("Error reading %s%s -- %s",
+                       file->m->strFilename.c_str(),
+                       strLine.c_str(),
+                       what.c_str());
 
         setWhat(str.c_str());
@@ -121 +130 @@
         m->pelmRoot = m->pDoc->getRootElement();
         if (!m->pelmRoot || !m->pelmRoot->nameEquals("VirtualBox"))
-            throw ConfigFileError(this, N_("Root element in VirtualBox settings files must be \"VirtualBox\"."));
+            throw ConfigFileError(this, NULL, N_("Root element in VirtualBox settings files must be \"VirtualBox\"."));
 
         if (!(m->pelmRoot->getAttributeValue("version", m->strSettingsVersionFull)))
-            throw ConfigFileError(this, N_("Required VirtualBox/@version attribute is missing"));
+            throw ConfigFileError(this, m->pelmRoot, N_("Required VirtualBox/@version attribute is missing"));
 
         m->sv = SettingsVersion_Null;
@@ -145 +154 @@
 
         if (m->sv == SettingsVersion_Null)
-            throw ConfigFileError(this, N_("Cannot handle settings version '%s'"), m->strSettingsVersionFull.c_str());
+            throw ConfigFileError(this, m->pelmRoot, N_("Cannot handle settings version '%s'"), m->strSettingsVersionFull.c_str());
     }
     else
@@ -188 +197 @@
 
     if (guid.isEmpty())
-        throw ConfigFileError(this, N_("UUID \"%s\" has invalid format"), strUUID.c_str());
+        throw ConfigFileError(this, NULL, N_("UUID \"%s\" has invalid format"), strUUID.c_str());
 }
 
@@ -211 +220 @@
              && (pcsz[19] != 'Z')
            )
-            throw ConfigFileError(this, N_("Cannot handle ISO timestamp '%s': is not UTC date"), str.c_str());
+            throw ConfigFileError(this, NULL, N_("Cannot handle ISO timestamp '%s': is not UTC date"), str.c_str());
 
         int32_t yyyy;
@@ -248 +257 @@
             }
 
-            throw ConfigFileError(this, N_("Cannot parse ISO timestamp '%s': runtime error, %Rra"), str.c_str(), rc);
-        }
-
-        throw ConfigFileError(this, N_("Cannot parse ISO timestamp '%s': invalid format"), str.c_str());
+            throw ConfigFileError(this, NULL, N_("Cannot parse ISO timestamp '%s': runtime error, %Rra"), str.c_str(), rc);
+        }
+
+        throw ConfigFileError(this, NULL, N_("Cannot parse ISO timestamp '%s': invalid format"), str.c_str());
     }
 }
@@ -264 +273 @@
     RTTIME time;
     if (!RTTimeExplode(&time, &stamp))
-        throw ConfigFileError(this, N_("Timespec %lld ms is invalid"), RTTimeSpecGetMilli(&stamp));
+        throw ConfigFileError(this, NULL, N_("Timespec %lld ms is invalid"), RTTimeSpecGetMilli(&stamp));
 
     return Utf8StrFmt("%04ld-%02hd-%02hdT%02hd:%02hd:%02hdZ",
@@ -311 +320 @@
                 map[strName] = strValue;
             else
-                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, pelmExtraDataItem, N_("Required ExtraDataItem/@name or @value attribute is missing"));
+        }
     }
 }
@@ -360 +367 @@
                     flt.action = USBDeviceFilterAction_Hold;
                 else
-                    throw ConfigFileError(this, N_("Invalid value '%s' in DeviceFilter/@action attribute"), strAction.c_str());
+                    throw ConfigFileError(this, pelmLevel4Child, N_("Invalid value '%s' in DeviceFilter/@action attribute"), strAction.c_str());
             }
 
@@ -535 +542 @@
             }
             else
-                throw ConfigFileError(this, N_("Required MachineEntry/@uuid or @src attribute is missing"));
+                throw ConfigFileError(this, pelmChild1, N_("Required MachineEntry/@uuid or @src attribute is missing"));
         }
     }
@@ -563 +570 @@
         {
             if (!(elmMedium.getAttributeValue("format", med.strFormat)))
-                throw ConfigFileError(this, N_("Required HardDisk/@format attribute is missing"));
+                throw ConfigFileError(this, &elmMedium, N_("Required HardDisk/@format attribute is missing"));
 
             if (!(elmMedium.getAttributeValue("autoReset", med.fAutoReset)))
@@ -578 +585 @@
                     med.hdType = HardDiskType_Writethrough;
                 else
-                    throw ConfigFileError(this, N_("HardDisk/@type attribute must be one of Normal, Immutable or Writethrough"));
+                    throw ConfigFileError(this, &elmMedium, N_("HardDisk/@type attribute must be one of Normal, Immutable or Writethrough"));
             }
         }
@@ -602 +609 @@
                     med.properties[strPropName] = strPropValue;
                 else
-                    throw ConfigFileError(this, N_("Required HardDisk/Property/@name or @value attribute is missing"));
+                    throw ConfigFileError(this, pelmHDChild, N_("Required HardDisk/Property/@name or @value attribute is missing"));
             }
         }
@@ -609 +616 @@
     }
     else
-        throw ConfigFileError(this, N_("Required %s/@uuid or @location attribute is missing"), elmMedium.getName());
+        throw ConfigFileError(this, &elmMedium, N_("Required %s/@uuid or @location attribute is missing"), elmMedium.getName());
 }
 
@@ -680 +687 @@
                 llDhcpServers.push_back(srv);
             else
-                throw ConfigFileError(this, N_("Required DHCPServer/@networkName, @IPAddress, @networkMask, @lowerIP, @upperIP or @enabled attribute is missing"));
+                throw ConfigFileError(this, pelmServer, N_("Required DHCPServer/@networkName, @IPAddress, @networkMask, @lowerIP, @upperIP or @enabled attribute is missing"));
         }
     }
@@ -969 +976 @@
 
         if (!pelmAdapter->getAttributeValue("slot", nic.ulSlot))
-            throw ConfigFileError(this, N_("Required Adapter/@slot attribute is missing"));
+            throw ConfigFileError(this, pelmAdapter, N_("Required Adapter/@slot attribute is missing"));
 
         Utf8Str strTemp;
@@ -985 +992 @@
                 nic.type = NetworkAdapterType_I82545EM;
             else
-                throw ConfigFileError(this, N_("Invalid value '%s' in Adapter/type attribute"), strTemp.c_str());
+                throw ConfigFileError(this, pelmAdapter, N_("Invalid value '%s' in Adapter/@type attribute"), strTemp.c_str());
         }
 
@@ -1012 +1019 @@
             nic.mode = NetworkAttachmentType_Internal;
             if (!pelmAdapterChild->getAttributeValue("name", nic.strName))    // required network name
-                throw ConfigFileError(this, N_("Required InternalNetwork/name element is missing"));
+                throw ConfigFileError(this, pelmAdapterChild, N_("Required InternalNetwork/@name element is missing"));
         }
         else if ((pelmAdapterChild = pelmAdapter->findChildElement("HostOnlyInterface")))
@@ -1018 +1025 @@
             nic.mode = NetworkAttachmentType_HostOnly;
             if (!pelmAdapterChild->getAttributeValue("name", nic.strName))    // required network name
-                throw ConfigFileError(this, N_("Required HostOnlyInterface/name element is missing"));
+                throw ConfigFileError(this, pelmAdapterChild, N_("Required HostOnlyInterface/@name element is missing"));
         }
         // else: default is NetworkAttachmentType_Null
@@ -1040 +1047 @@
         SerialPort port;
         if (!pelmPort->getAttributeValue("slot", port.ulSlot))
-            throw ConfigFileError(this, N_("Required UART/Port/@slot attribute is missing"));
+            throw ConfigFileError(this, pelmPort, N_("Required UART/Port/@slot attribute is missing"));
 
         // slot must be unique
@@ -1047 +1054 @@
              ++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, pelmPort, N_("Invalid value %RU32 in UART/Port/@slot attribute: value is not unique"), port.ulSlot);
 
         if (!pelmPort->getAttributeValue("enabled", port.fEnabled))
-            throw ConfigFileError(this, N_("Required UART/Port/@enabled attribute is missing"));
+            throw ConfigFileError(this, pelmPort, 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, pelmPort, 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, pelmPort, 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, pelmPort, N_("Required UART/Port/@hostMode attribute is missing"));
         if (strPortMode == "RawFile")
             port.portMode = PortMode_RawFile;
@@ -1068 +1075 @@
             port.portMode = PortMode_Disconnected;
         else
-            throw ConfigFileError(this, N_("Invalid value '%s' in UART/Port/@hostMode attribute"), strPortMode.c_str());
+            throw ConfigFileError(this, pelmPort, N_("Invalid value '%s' in UART/Port/@hostMode attribute"), strPortMode.c_str());
 
         pelmPort->getAttributeValue("path", port.strPath);
@@ -1091 +1098 @@
         ParallelPort port;
         if (!pelmPort->getAttributeValue("slot", port.ulSlot))
-            throw ConfigFileError(this, N_("Required LPT/Port/@slot attribute is missing"));
+            throw ConfigFileError(this, pelmPort, N_("Required LPT/Port/@slot attribute is missing"));
 
         // slot must be unique
@@ -1098 +1105 @@
              ++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, pelmPort, N_("Invalid value %RU32 in LPT/Port/@slot attribute: value is not unique"), port.ulSlot);
 
         if (!pelmPort->getAttributeValue("enabled", port.fEnabled))
-            throw ConfigFileError(this, N_("Required LPT/Port/@enabled attribute is missing"));
+            throw ConfigFileError(this, pelmPort, 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, pelmPort, 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, pelmPort, N_("Required LPT/Port/@IRQ attribute is missing"));
 
         pelmPort->getAttributeValue("path", port.strPath);
@@ -1202 +1209 @@
                 Utf8Str strDevice;
                 if (!pelmOrder->getAttributeValue("position", ulPos))
-                    throw ConfigFileError(this, N_("Required Boot/Order/@position attribute is missing"));
+                    throw ConfigFileError(this, pelmOrder, N_("Required Boot/Order/@position attribute is missing"));
 
                 if (    ulPos < 1
@@ -1208 +1215 @@
                    )
                     throw ConfigFileError(this,
+                                          pelmOrder,
                                           N_("Invalid value '%RU32' in Boot/Order/@position: must be greater than 0 and less than %RU32"),
                                           ulPos,
@@ -1215 +1223 @@
 
                 if (hw.mapBootOrder.find(ulPos) != hw.mapBootOrder.end())
-                    throw ConfigFileError(this, N_("Invalid value '%RU32' in Boot/Order/@position: value is not unique"), ulPos);
+                    throw ConfigFileError(this, pelmOrder, N_("Invalid value '%RU32' in Boot/Order/@position: value is not unique"), ulPos);
 
                 if (!pelmOrder->getAttributeValue("device", strDevice))
-                    throw ConfigFileError(this, N_("Required Boot/Order/@device attribute is missing"));
+                    throw ConfigFileError(this, pelmOrder, N_("Required Boot/Order/@device attribute is missing"));
 
                 DeviceType_T type;
@@ -1232 +1240 @@
                     type = DeviceType_Network;
                 else
-                    throw ConfigFileError(this, N_("Invalid value '%s' in Boot/Order/@device attribute"), strDevice.c_str());
+                    throw ConfigFileError(this, pelmOrder, N_("Invalid value '%s' in Boot/Order/@device attribute"), strDevice.c_str());
                 hw.mapBootOrder[ulPos] = type;
             }
@@ -1259 +1267 @@
                     hw.vrdpSettings.authType = VRDPAuthType_External;
                 else
-                    throw ConfigFileError(this, N_("Invalid value '%s' in RemoteDisplay/@authType attribute"), strAuthType.c_str());
+                    throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in RemoteDisplay/@authType attribute"), strAuthType.c_str());
             }
 
@@ -1292 +1300 @@
                         hw.biosSettings.biosBootMenuMode = BIOSBootMenuMode_MessageAndMenu;
                     else
-                        throw ConfigFileError(this, N_("Invalid value '%s' in BootMenu/@mode attribute"), strBootMenuMode.c_str());
+                        throw ConfigFileError(this, pelmBIOSChild, N_("Invalid value '%s' in BootMenu/@mode attribute"), strBootMenuMode.c_str());
                 }
             }
@@ -1319 +1327 @@
                         sctl.controllerType = StorageControllerType_ICH6;
                     else
-                        throw ConfigFileError(this, N_("Invalid value '%s' for IDEController/@type attribute"), strType.c_str());
+                        throw ConfigFileError(this, pelmBIOSChild, N_("Invalid value '%s' for IDEController/@type attribute"), strType.c_str());
                 }
                 sctl.ulPortCount = 2;
@@ -1394 +1402 @@
                     hw.audioAdapter.controllerType = AudioControllerType_AC97;
                 else
-                    throw ConfigFileError(this, N_("Invalid value '%s' in AudioAdapter/@controller attribute"), strTemp.c_str());
+                    throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in AudioAdapter/@controller attribute"), strTemp.c_str());
             }
             if (pelmHwChild->getAttributeValue("driver", strTemp))
@@ -1417 +1425 @@
                     hw.audioAdapter.driverType = AudioDriverType_MMPM;
                 else
-                    throw ConfigFileError(this, N_("Invalid value '%s' in AudioAdapter/@driver attribute"), strTemp.c_str());
+                    throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in AudioAdapter/@driver attribute"), strTemp.c_str());
             }
         }
@@ -1447 +1455 @@
                     hw.clipboardMode = ClipboardMode_Bidirectional;
                 else
-                    throw ConfigFileError(this, N_("Invalid value '%s' in Clipbord/@mode attribute"), strTemp.c_str());
+                    throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in Clipbord/@mode attribute"), strTemp.c_str());
             }
         }
@@ -1458 +1466 @@
             readGuestProperties(*pelmHwChild, hw);
         else
-            throw ConfigFileError(this, N_("Invalid element '%s' in Hardware section"), pelmHwChild->getName());
+            throw ConfigFileError(this, pelmHwChild, 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, &elmHardware, N_("Required Memory/@RAMSize element/attribute is missing"));
 }
 
@@ -1499 +1507 @@
 
         if (!pelmAttachment->getAttributeValue("hardDisk", strUUID))
-            throw ConfigFileError(this, N_("Required HardDiskAttachment/@hardDisk attribute is missing"));
+            throw ConfigFileError(this, pelmAttachment, 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, pelmAttachment, 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, pelmAttachment, 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, pelmAttachment, 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, pelmAttachment, N_("HardDiskAttachment/@bus is 'IDE' but cannot find IDE controller"));
             pIDEController->llAttachedDevices.push_back(att);
         }
@@ -1520 +1528 @@
         {
             if (!pSATAController)
-                throw ConfigFileError(this, N_("HardDiskAttachment/@bus is 'SATA' but cannot find SATA controller"));
+                throw ConfigFileError(this, pelmAttachment, 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, pelmAttachment, N_("HardDiskAttachment/@bus attribute has illegal value '%s'"), strBus.c_str());
     }
 }
@@ -1548 +1556 @@
 
         if (!pelmController->getAttributeValue("name", sctl.strName))
-            throw ConfigFileError(this, N_("Required StorageController/@name attribute is missing"));
+            throw ConfigFileError(this, pelmController, 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, pelmController, N_("Required StorageController/@type attribute is missing"));
 
         if (strType == "AHCI")
@@ -1584 +1592 @@
         }
         else
-            throw ConfigFileError(this, N_("Invalid value '%s' for StorageController/@type attribute"), strType.c_str());
+            throw ConfigFileError(this, pelmController, N_("Invalid value '%s' for StorageController/@type attribute"), strType.c_str());
 
         readStorageControllerAttributes(*pelmController, sctl);
@@ -1601 +1609 @@
                 const xml::ElementNode *pelmImage;
                 if (!(pelmImage = pelmAttached->findChildElement("Image")))
-                    throw ConfigFileError(this, N_("Required AttachedDevice/Image element is missing"));
+                    throw ConfigFileError(this, pelmImage, N_("Required AttachedDevice/Image element is missing"));
 
                 if (!pelmImage->getAttributeValue("uuid", strTemp))
-                    throw ConfigFileError(this, N_("Required AttachedDevice/Image/@uuid attribute is missing"));
+                    throw ConfigFileError(this, pelmImage, 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"));
+                    throw ConfigFileError(this, pelmImage, N_("Required AttachedDevice/@port attribute is missing"));
                 if (!pelmAttached->getAttributeValue("device", att.lDevice))
-                    throw ConfigFileError(this, N_("Required AttachedDevice/@device attribute is missing"));
+                    throw ConfigFileError(this, pelmImage, N_("Required AttachedDevice/@device attribute is missing"));
 
                 sctl.llAttachedDevices.push_back(att);
@@ -1637 +1645 @@
 
     if (!elmSnapshot.getAttributeValue("uuid", strTemp))
-        throw ConfigFileError(this, N_("Required Snapshot/@uuid attribute is missing"));
+        throw ConfigFileError(this, &elmSnapshot, 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, &elmSnapshot, 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, &elmSnapshot, N_("Required Snapshot/@timeStamp attribute is missing"));
     parseTimestamp(snap.timestamp, strTemp);
 
@@ -1654 +1662 @@
     const xml::ElementNode *pelmHardware;
     if (!(pelmHardware = elmSnapshot.findChildElement("Hardware")))
-        throw ConfigFileError(this, N_("Required Snapshot/@Hardware element is missing"));
+        throw ConfigFileError(this, &elmSnapshot, N_("Required Snapshot/@Hardware element is missing"));
     readHardware(*pelmHardware, snap.hardware, snap.storage);
 
@@ -1721 +1729 @@
         const xml::ElementNode *pelmHardware;
         if (!(pelmHardware = elmMachine.findChildElement("Hardware")))
-            throw ConfigFileError(this, N_("Required Machine/Hardware element is missing"));
+            throw ConfigFileError(this, &elmMachine, N_("Required Machine/Hardware element is missing"));
         readHardware(*pelmHardware, hardwareMachine, storageMachine);
 
@@ -1751 +1759 @@
     }
     else
-        throw ConfigFileError(this, N_("Required Machine/@uuid or @name attributes is missing"));
+        throw ConfigFileError(this, &elmMachine, N_("Required Machine/@uuid or @name attributes is missing"));
 }
 
@@ -1786 +1794 @@
             if (pelmRootChild->nameEquals("Machine"))
                 readMachine(*pelmRootChild);
-            else
-                throw ConfigFileError(this, N_("Invalid element %s under root element"), pelmRootChild->getName());
         }