Changeset 22173 in vbox for trunk/src

Timestamp:

Aug 11, 2009 3:38:59 PM (15 years ago)

Author:

vboxsync

Message:

Main: the big XML settings rework. Move XML reading/writing out of interface implementation code into separate layer so it can handle individual settings versions in the future.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.cpp (modified) (6 diffs)
• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)
• Frontends/VirtualBox/include/VBoxGlobal.h (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxSelectorWnd.cpp (modified) (1 diff)
• Main/ApplianceImpl.cpp (modified) (10 diffs)
• Main/AudioAdapterImpl.cpp (modified) (4 diffs)
• Main/BIOSSettingsImpl.cpp (modified) (4 diffs)
• Main/ConsoleImpl.cpp (modified) (18 diffs)
• Main/ConsoleImpl2.cpp (modified) (6 diffs)
• Main/DHCPServerImpl.cpp (modified) (5 diffs)
• Main/DVDDriveImpl.cpp (modified) (9 diffs)
• Main/FloppyDriveImpl.cpp (modified) (6 diffs)
• Main/HardDiskImpl.cpp (modified) (44 diffs)
• Main/HostImpl.cpp (modified) (4 diffs)
• Main/MachineImpl.cpp (modified) (193 diffs)
• Main/MediumImpl.cpp (modified) (8 diffs)
• Main/NetworkAdapterImpl.cpp (modified) (4 diffs)
• Main/ParallelPortImpl.cpp (modified) (4 diffs)
• Main/Performance.cpp (modified) (3 diffs)
• Main/SerialPortImpl.cpp (modified) (4 diffs)
• Main/SharedFolderImpl.cpp (modified) (2 diffs)
• Main/SnapshotImpl.cpp (modified) (17 diffs)
• Main/StorageControllerImpl.cpp (modified) (4 diffs)
• Main/SystemPropertiesImpl.cpp (modified) (9 diffs)
• Main/USBControllerImpl.cpp (modified) (7 diffs)
• Main/VFSExplorerImpl.cpp (modified) (2 diffs)
• Main/VirtualBoxImpl.cpp (modified) (52 diffs)
• Main/VirtualBoxImplExtra.cpp (modified) (1 diff)
• Main/generic/NetIf-generic.cpp (modified) (2 diffs)
• Main/glue/SupportErrorInfo.cpp (modified) (4 diffs)
• Main/glue/VirtualBoxErrorInfo.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (9 diffs)
• Main/include/AudioAdapterImpl.h (modified) (2 diffs)
• Main/include/BIOSSettingsImpl.h (modified) (2 diffs)
• Main/include/DHCPServerImpl.h (modified) (3 diffs)
• Main/include/DHCPServerRunner.h (modified) (2 diffs)
• Main/include/DVDDriveImpl.h (modified) (2 diffs)
• Main/include/FloppyDriveImpl.h (modified) (2 diffs)
• Main/include/HardDiskImpl.h (modified) (4 diffs)
• Main/include/HostImpl.h (modified) (3 diffs)
• Main/include/MachineImpl.h (modified) (17 diffs)
• Main/include/MediumImpl.h (modified) (6 diffs)
• Main/include/NetworkAdapterImpl.h (modified) (2 diffs)
• Main/include/ParallelPortImpl.h (modified) (2 diffs)
• Main/include/Performance.h (modified) (2 diffs)
• Main/include/SerialPortImpl.h (modified) (2 diffs)
• Main/include/SnapshotImpl.h (modified) (4 diffs)
• Main/include/StorageControllerImpl.h (modified) (4 diffs)
• Main/include/SystemPropertiesImpl.h (modified) (3 diffs)
• Main/include/USBControllerImpl.h (modified) (2 diffs)
• Main/include/VRDPServerImpl.h (modified) (2 diffs)
• Main/include/VirtualBoxBase.h (modified) (1 diff)
• Main/include/VirtualBoxImpl.h (modified) (11 diffs)
• Main/include/VirtualBoxImplExtra.h (modified) (1 diff)
• Main/include/VirtualBoxXMLUtil.h (modified) (1 diff)
• Main/xml/Settings.cpp (modified) (1 diff)
• Main/xml/ovfreader.cpp (modified) (1 diff)
• Runtime/r3/xml.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -474 +474 @@
     HRESULT hrc = NewUniqueKey(machine, "VBoxInternal/DBGF/loadsyms", KeyStr);
     if (SUCCEEDED(hrc))
-        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "Filename", pszFilename);
+        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "Filename", pszFilename);
     if (SUCCEEDED(hrc) && argc >= 3)
-        hrc = SetInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "Delta", offDelta);
+        hrc = SetInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "Delta", offDelta);
     if (SUCCEEDED(hrc) && argc >= 4)
-        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "Module", pszModule);
+        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "Module", pszModule);
     if (SUCCEEDED(hrc) && argc >= 5)
-        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "ModuleAddress", ModuleAddress);
+        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "ModuleAddress", ModuleAddress);
     if (SUCCEEDED(hrc) && argc >= 6)
-        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "ModuleSize", ModuleSize);
+        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "ModuleSize", ModuleSize);
 
     return FAILED(hrc);

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -1267 +1267 @@
         if (!strcmp(a->argv[1], "enumerate"))
         {
-            Bstr extraDataKey;
-
-            do
-            {
-                Bstr nextExtraDataKey;
-                Bstr nextExtraDataValue;
-                HRESULT rcEnum = a->virtualBox->GetNextExtraDataKey(extraDataKey, nextExtraDataKey.asOutParam(),
-                                                                    nextExtraDataValue.asOutParam());
-                extraDataKey = nextExtraDataKey;
-
-                if (SUCCEEDED(rcEnum) && !extraDataKey.isEmpty())
-                    RTPrintf("Key: %lS, Value: %lS\n", nextExtraDataKey.raw(), nextExtraDataValue.raw());
-            } while (!extraDataKey.isEmpty());
+            SafeArray<BSTR> aKeys;
+            CHECK_ERROR(a->virtualBox, GetExtraDataKeys(ComSafeArrayAsOutParam(aKeys)));
+
+            for (size_t i = 0;
+                 i < aKeys.size();
+                 ++i)
+            {
+                Bstr bstrKey(aKeys[i]);
+                Bstr bstrValue;
+                CHECK_ERROR(a->virtualBox, GetExtraData(bstrKey, bstrValue.asOutParam()));
+
+                RTPrintf("Key: %lS, Value: %lS\n", bstrKey.raw(), bstrValue.raw());
+            }
         }
         else
@@ -1306 +1306 @@
             if (!strcmp(a->argv[1], "enumerate"))
             {
-                Bstr extraDataKey;
-
-                do
-                {
-                    Bstr nextExtraDataKey;
-                    Bstr nextExtraDataValue;
-                    HRESULT rcEnum = machine->GetNextExtraDataKey(extraDataKey, nextExtraDataKey.asOutParam(),
-                                                                  nextExtraDataValue.asOutParam());
-                    extraDataKey = nextExtraDataKey;
-
-                    if (SUCCEEDED(rcEnum) && !extraDataKey.isEmpty())
-                    {
-                        RTPrintf("Key: %lS, Value: %lS\n", nextExtraDataKey.raw(), nextExtraDataValue.raw());
-                    }
-                } while (!extraDataKey.isEmpty());
+                SafeArray<BSTR> aKeys;
+                CHECK_ERROR(machine, GetExtraDataKeys(ComSafeArrayAsOutParam(aKeys)));
+
+                for (size_t i = 0;
+                    i < aKeys.size();
+                    ++i)
+                {
+                    Bstr bstrKey(aKeys[i]);
+                    Bstr bstrValue;
+                    CHECK_ERROR(machine, GetExtraData(bstrKey, bstrValue.asOutParam()));
+
+                    RTPrintf("Key: %lS, Value: %lS\n", bstrKey.raw(), bstrValue.raw());
+                }
             }
             else
@@ -1697 +1695 @@
 #endif /* !VBOX_ONLY_DOCS */
 
-enum ConvertSettings
-{
-    ConvertSettings_No      = 0,
-    ConvertSettings_Yes     = 1,
-    ConvertSettings_Backup  = 2,
-    ConvertSettings_Ignore  = 3,
-};
-
-#ifndef VBOX_ONLY_DOCS
-/**
- * Checks if any of the settings files were auto-converted and informs the
- * user if so.
- *
- * @return @false if the program should terminate and @true otherwise.
- */
-static bool checkForAutoConvertedSettings (ComPtr<IVirtualBox> virtualBox,
-                                           ComPtr<ISession> session,
-                                           ConvertSettings fConvertSettings)
-{
-    /* return early if nothing to do */
-    if (fConvertSettings == ConvertSettings_Ignore)
-        return true;
-
-    HRESULT rc;
-
-    do
-    {
-        Bstr formatVersion;
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFormatVersion) (formatVersion.asOutParam()));
-
-        bool isGlobalConverted = false;
-        std::list <ComPtr <IMachine> > cvtMachines;
-        std::list <Utf8Str> fileList;
-        Bstr version;
-        Bstr filePath;
-
-        com::SafeIfaceArray <IMachine> machines;
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(Machines)(ComSafeArrayAsOutParam (machines)));
-
-        for (size_t i = 0; i < machines.size(); ++ i)
-        {
-            BOOL accessible;
-            CHECK_ERROR_BREAK(machines[i], COMGETTER(Accessible) (&accessible));
-            if (!accessible)
-                continue;
-
-            CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFileVersion) (version.asOutParam()));
-
-            if (version != formatVersion)
-            {
-                cvtMachines.push_back (machines [i]);
-                Bstr filePath;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFilePath) (filePath.asOutParam()));
-                fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
-                                                version.raw()));
-            }
-        }
-
-        if (FAILED(rc))
-            break;
-
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFileVersion) (version.asOutParam()));
-        if (version != formatVersion)
-        {
-            isGlobalConverted = true;
-            CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFilePath) (filePath.asOutParam()));
-            fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
-                                            version.raw()));
-        }
-
-        if (fileList.size() > 0)
-        {
-            switch (fConvertSettings)
-            {
-                case ConvertSettings_No:
-                {
-                    RTPrintf (
-"WARNING! The following VirtualBox settings files have been automatically\n"
-"converted to the new settings file format version '%ls':\n"
-"\n",
-                              formatVersion.raw());
-
-                    for (std::list <Utf8Str>::const_iterator f = fileList.begin();
-                         f != fileList.end(); ++ f)
-                        RTPrintf ("  %S\n", (*f).raw());
-                    RTPrintf (
-"\n"
-"The current command was aborted to prevent overwriting the above settings\n"
-"files with the results of the auto-conversion without your permission.\n"
-"Please put one of the following command line switches to the beginning of\n"
-"the VBoxManage command line and repeat the command:\n"
-"\n"
-"  --convertSettings       - to save all auto-converted files (it will not\n"
-"                            be possible to use these settings files with an\n"
-"                            older version of VirtualBox in the future);\n"
-"  --convertSettingsBackup - to create backup copies of the settings files in\n"
-"                            the old format before saving them in the new format;\n"
-"  --convertSettingsIgnore - to not save the auto-converted settings files.\n"
-"\n"
-"Note that if you use --convertSettingsIgnore, the auto-converted settings files\n"
-"will be implicitly saved in the new format anyway once you change a setting or\n"
-"start a virtual machine, but NO backup copies will be created in this case.\n");
-                    return false;
-                }
-                case ConvertSettings_Yes:
-                case ConvertSettings_Backup:
-                {
-                    break;
-                }
-                default:
-                    AssertFailedReturn (false);
-            }
-
-            for (std::list <ComPtr <IMachine> >::const_iterator m = cvtMachines.begin();
-                 m != cvtMachines.end(); ++ m)
-            {
-                Bstr id;
-                CHECK_ERROR_BREAK((*m), COMGETTER(Id) (id.asOutParam()));
-
-                /* open a session for the VM */
-                CHECK_ERROR_BREAK (virtualBox, OpenSession (session, id));
-
-                ComPtr <IMachine> sm;
-                CHECK_ERROR_BREAK(session, COMGETTER(Machine) (sm.asOutParam()));
-
-                Bstr bakFileName;
-                if (fConvertSettings == ConvertSettings_Backup)
-                    CHECK_ERROR (sm, SaveSettingsWithBackup (bakFileName.asOutParam()));
-                else
-                    CHECK_ERROR (sm, SaveSettings());
-
-                session->Close();
-
-                if (FAILED(rc))
-                    break;
-            }
-
-            if (FAILED(rc))
-                break;
-
-            if (isGlobalConverted)
-            {
-                Bstr bakFileName;
-                if (fConvertSettings == ConvertSettings_Backup)
-                    CHECK_ERROR (virtualBox, SaveSettingsWithBackup (bakFileName.asOutParam()));
-                else
-                    CHECK_ERROR (virtualBox, SaveSettings());
-            }
-
-            if (FAILED(rc))
-                break;
-        }
-    }
-    while (0);
-
-    return SUCCEEDED (rc);
-}
-#endif /* !VBOX_ONLY_DOCS */
-
 // main
 ///////////////////////////////////////////////////////////////////////////////
@@ -1871 +1710 @@
     int  iCmdArg;
 
-    ConvertSettings fConvertSettings = ConvertSettings_No;
-
     /* global options */
     for (int i = 1; i < argc || argc <= iCmd; i++)
@@ -1912 +1749 @@
             iCmd++;
         }
-        else if (   !strcmp(argv[i], "--convertSettings")
-                 || !strcmp(argv[i], "-convertSettings"))
-        {
-            fConvertSettings = ConvertSettings_Yes;
-            iCmd++;
-        }
-        else if (   !strcmp(argv[i], "--convertSettingsBackup")
-                 || !strcmp(argv[i], "-convertSettingsBackup"))
-        {
-            fConvertSettings = ConvertSettings_Backup;
-            iCmd++;
-        }
-        else if (   !strcmp(argv[i], "--convertSettingsIgnore")
-                 || !strcmp(argv[i], "-convertSettingsIgnore"))
-        {
-            fConvertSettings = ConvertSettings_Ignore;
-            iCmd++;
-        }
         else
         {
@@ -2013 +1832 @@
     NS_GetMainEventQ(getter_AddRefs(eventQ));
 #endif
-
-    if (!checkForAutoConvertedSettings (virtualBox, session, fConvertSettings))
-        break;
 
 #ifdef USE_XPCOM_QUEUE

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -616 +616 @@
         {
             char szFilenameAbs[RTPATH_MAX] = "";
-            int vrc = RTPathAbs(Utf8Str(src), szFilenameAbs, sizeof(szFilenameAbs));
+            int vrc = RTPathAbs(Utf8Str(src).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
             if (RT_FAILURE(vrc))
             {
@@ -650 +650 @@
                 {
                     char szFilenameAbs[RTPATH_MAX] = "";
-                    int vrc = RTPathAbs(Utf8Str(dst), szFilenameAbs, sizeof(szFilenameAbs));
+                    int vrc = RTPathAbs(Utf8Str(dst).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
                     if (RT_FAILURE(vrc))
                     {

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -771 +771 @@
 }
 #endif /* VBOXSDL_WITH_X11 */
-
-enum ConvertSettings
-{
-    ConvertSettings_No      = 0,
-    ConvertSettings_Yes     = 1,
-    ConvertSettings_Backup  = 2,
-    ConvertSettings_Ignore  = 3,
-};
-
-/**
- * Checks if any of the settings files were auto-converted and informs the
- * user if so.
- *
- * @return @false if the program should terminate and @true otherwise.
- *
- * @note The function is taken from VBoxManage.cpp almost unchanged (except the
- *       help text).
- */
-static bool checkForAutoConvertedSettings (ComPtr<IVirtualBox> virtualBox,
-                                           ComPtr<ISession> session,
-                                           ConvertSettings fConvertSettings)
-{
-    /* return early if nothing to do */
-    if (fConvertSettings == ConvertSettings_Ignore)
-        return true;
-
-    HRESULT rc;
-
-    do
-    {
-        Bstr formatVersion;
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFormatVersion) (formatVersion.asOutParam()));
-
-        bool isGlobalConverted = false;
-        std::list <ComPtr <IMachine> > cvtMachines;
-        std::list <Utf8Str> fileList;
-        Bstr version;
-        Bstr filePath;
-
-        com::SafeIfaceArray <IMachine> machines;
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(Machines)(ComSafeArrayAsOutParam (machines)));
-
-        for (size_t i = 0; i < machines.size(); ++ i)
-        {
-            BOOL accessible;
-            CHECK_ERROR_BREAK(machines[i], COMGETTER(Accessible) (&accessible));
-            if (!accessible)
-                continue;
-
-            CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFileVersion) (version.asOutParam()));
-
-            if (version != formatVersion)
-            {
-                cvtMachines.push_back (machines[i]);
-                Bstr filePath;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFilePath) (filePath.asOutParam()));
-                fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
-                                                version.raw()));
-            }
-        }
-
-        if (FAILED(rc))
-            break;
-
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFileVersion) (version.asOutParam()));
-        if (version != formatVersion)
-        {
-            isGlobalConverted = true;
-            CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFilePath) (filePath.asOutParam()));
-            fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
-                                            version.raw()));
-        }
-
-        if (fileList.size() > 0)
-        {
-            switch (fConvertSettings)
-            {
-                case ConvertSettings_No:
-                {
-                    RTPrintf (
-"WARNING! The following VirtualBox settings files have been automatically\n"
-"converted to the new settings file format version '%ls':\n"
-"\n",
-                              formatVersion.raw());
-
-                    for (std::list <Utf8Str>::const_iterator f = fileList.begin();
-                         f != fileList.end(); ++ f)
-                        RTPrintf ("  %S\n", (*f).raw());
-                    RTPrintf (
-"\n"
-"The current command was aborted to prevent overwriting the above settings\n"
-"files with the results of the auto-conversion without your permission.\n"
-"Please add one of the following command line switches to the VBoxSDL command\n"
-"line and repeat the command:\n"
-"\n"
-"  --convertSettings       - to save all auto-converted files (it will not\n"
-"                            be possible to use these settings files with an\n"
-"                            older version of VirtualBox in the future);\n"
-"  --convertSettingsBackup - to create backup copies of the settings files in\n"
-"                            the old format before saving them in the new format;\n"
-"  --convertSettingsIgnore - to not save the auto-converted settings files.\n"
-"\n"
-"Note that if you use --convertSettingsIgnore, the auto-converted settings files\n"
-"will be implicitly saved in the new format anyway once you change a setting or\n"
-"start a virtual machine, but NO backup copies will be created in this case.\n");
-                    return false;
-                }
-                case ConvertSettings_Yes:
-                case ConvertSettings_Backup:
-                {
-                    break;
-                }
-                default:
-                    AssertFailedReturn (false);
-            }
-
-            for (std::list <ComPtr <IMachine> >::const_iterator m = cvtMachines.begin();
-                 m != cvtMachines.end(); ++ m)
-            {
-                Bstr id;
-                CHECK_ERROR_BREAK((*m), COMGETTER(Id) (id.asOutParam()));
-
-                /* open a session for the VM */
-                CHECK_ERROR_BREAK (virtualBox, OpenSession (session, id));
-
-                ComPtr <IMachine> sm;
-                CHECK_ERROR_BREAK(session, COMGETTER(Machine) (sm.asOutParam()));
-
-                Bstr bakFileName;
-                if (fConvertSettings == ConvertSettings_Backup)
-                    CHECK_ERROR (sm, SaveSettingsWithBackup (bakFileName.asOutParam()));
-                else
-                    CHECK_ERROR (sm, SaveSettings());
-
-                session->Close();
-
-                if (FAILED(rc))
-                    break;
-            }
-
-            if (FAILED(rc))
-                break;
-
-            if (isGlobalConverted)
-            {
-                Bstr bakFileName;
-                if (fConvertSettings == ConvertSettings_Backup)
-                    CHECK_ERROR (virtualBox, SaveSettingsWithBackup (bakFileName.asOutParam()));
-                else
-                    CHECK_ERROR (virtualBox, SaveSettings());
-            }
-
-            if (FAILED(rc))
-                break;
-        }
-    }
-    while (0);
-
-    return SUCCEEDED (rc);
-}
 
 /** entry point */
@@ -1184 +1024 @@
     sysInfo->COMGETTER (NetworkAdapterCount) (&NetworkAdapterCount);
 
-    ConvertSettings fConvertSettings = ConvertSettings_No;
-
     // command line argument parsing stuff
     for (int curArg = 1; curArg < argc; curArg++)
@@ -1602 +1440 @@
             gHostKeyMod = atoi(argv[curArg]);
         }
-        else if (   !strcmp(argv[curArg], "--convertSettings")
-                 || !strcmp(argv[curArg], "-convertSettings"))
-            fConvertSettings = ConvertSettings_Yes;
-        else if (   !strcmp(argv[curArg], "--convertSettingsBackup")
-                 || !strcmp(argv[curArg], "-convertSettingsBackup"))
-            fConvertSettings = ConvertSettings_Backup;
-        else if (   !strcmp(argv[curArg], "--convertSettingsIgnore")
-                 || !strcmp(argv[curArg], "-convertSettingsIgnore"))
-            fConvertSettings = ConvertSettings_Ignore;
         /* just show the help screen */
         else
@@ -1623 +1452 @@
     }
     if (FAILED (rc))
-        break;
-
-    if (!checkForAutoConvertedSettings (virtualBox, session, fConvertSettings))
         break;
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -610 +610 @@
 #endif
 
-    bool checkForSettingsAutoConversion (bool aAfterRefresh = false);
-
-    bool checkForSettingsAutoConversionAfterRefresh() { return checkForSettingsAutoConversion (true); }
-
     CSession openSession (const QString &aId, bool aExisting = false);
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -2111 +2111 @@
 
 /**
- * Checks if any of the settings files were auto-converted and informs the user
- * if so. Returns @c false if the user select to exit the application.
- *
- * @param aAfterRefresh @c true to suppress the first simple dialog aExit
- *                      button. Used when calling after the VM refresh.
- */
-bool VBoxGlobal::checkForSettingsAutoConversion (bool aAfterRefresh /* = false */)
-{
-    QString currentVersion = mVBox.GetSettingsFormatVersion();
-    QList <CMachine> machines;
-    bool isGlobalToBeConverted = false;
-    QString fileList;
-    int maxIndex = 0;
-
-    /* Check if VM files need to be converted */
-    CMachineVector vec = mVBox.GetMachines();
-    for (CMachineVector::ConstIterator m = vec.begin(); m != vec.end(); ++ m)
-    {
-        if (!m->GetAccessible())
-            continue;
-
-        QString version = m->GetSettingsFileVersion();
-        if (version != currentVersion)
-        {
-            ++ maxIndex;
-            machines.append (*m);
-            fileList += QString ("<tr><td><nobr>%1</nobr></td><td>&nbsp;&nbsp;</td>"
-                                 "</td><td><nobr><i>%2</i></nobr></td></tr>")
-                .arg (m->GetSettingsFilePath())
-                .arg (version);
-        }
-    }
-
-    /* Check if global file need to be converted */
-    if (!aAfterRefresh)
-    {
-        QString version = mVBox.GetSettingsFileVersion();
-        if (version != currentVersion)
-        {
-            ++ maxIndex;
-            isGlobalToBeConverted = true;
-            fileList += QString ("<tr><td><nobr>%1</nobr></td><td>&nbsp;&nbsp;</td>"
-                                 "</td><td><nobr><i>%2</i></nobr></td></tr>")
-                .arg (mVBox.GetSettingsFilePath())
-                .arg (version);
-        }
-    }
-
-    if (!fileList.isNull())
-    {
-        fileList = QString ("<table cellspacing=0 cellpadding=0>%1</table>")
-                            .arg (fileList);
-
-        /* Asking the user about he wants to convert the
-         * configuration files or leave it as already is. */
-        if (vboxProblem().warnAboutSettingsAutoConversion (
-            fileList, aAfterRefresh) == QIMessageBox::Cancel)
-            return false;
-
-        /* Composing progress dialog */
-        QProgressDialog dlg (mainWindow());
-        dlg.setCancelButton (0);
-        dlg.setWindowModality (Qt::WindowModal);
-        dlg.setMinimum (0);
-        dlg.setMaximum (maxIndex);
-        dlg.setMinimumDuration (2000);
-        dlg.setAutoReset (false);
-
-        /* Converting VM configuration files */
-        foreach (CMachine m, machines)
-        {
-            dlg.setValue (machines.indexOf (m));
-            dlg.setLabelText (tr ("Converting file... (%1/%2)")
-                              .arg (machines.indexOf (m) + 1).arg (maxIndex));
-
-            CSession session = openSession (m.GetId());
-            if (!session.isNull())
-            {
-                CMachine sm = session.GetMachine();
-                sm.SaveSettingsWithBackup();
-                if (!sm.isOk())
-                    vboxProblem().cannotSaveMachineSettings (sm);
-                session.Close();
-            }
-        }
-
-        /* Converting global configuration file */
-        if (isGlobalToBeConverted)
-        {
-            dlg.setValue (machines.size());
-            dlg.setLabelText (tr ("Converting file... (%1/%2)")
-                              .arg (machines.size() + 1).arg (maxIndex));
-
-            mVBox.SaveSettingsWithBackup();
-            if (!mVBox.isOk())
-                vboxProblem().cannotSaveGlobalSettings (mVBox);
-        }
-
-        dlg.setValue (maxIndex);
-        dlg.setLabelText (tr ("Conversion finished!"));
-    }
-
-    return true;
-}
-
-/**
  *  Opens a direct session for a machine with the given ID.
  *  This method does user-friendly error handling (display error messages, etc.).
@@ -4484 +4378 @@
 
     retranslateUi();
-
-    /* Note: the settings conversion check must be done before anything else
-     * that may unconditionally overwrite settings files in the new format (like
-     * SetExtraData()). But after loading the proper the language. */
-    if (!checkForSettingsAutoConversion())
-        return;
 
 #ifdef VBOX_GUI_WITH_SYSTRAY

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -1115 +1115 @@
                    true /* aDescription */);
 
-    if (!oldAccessible && item->accessible() &&
-        !vboxGlobal().checkForSettingsAutoConversionAfterRefresh())
+    if (!oldAccessible && item->accessible())
         fileExit();
 }

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -994 +994 @@
 
         /* The temporary name of the target OVF file */
-        strTmpOvf = Utf8StrFmt("%s/%s", pszTmpDir, RTPathFilename(tmpPath));
+        strTmpOvf = Utf8StrFmt("%s/%s", pszTmpDir, RTPathFilename(tmpPath.c_str()));
 
         /* Next we have to download the OVF */
@@ -1554 +1554 @@
                         VirtualSystemDescriptionEntry *vsdeHD = *itHD;
 
-                        const char *pcszDstFilePath = vsdeHD->strVbox.c_str();
                         /* Check if the destination file exists already or the
                          * destination path is empty. */
-                        if (    !(*pcszDstFilePath)
-                             || RTPathExists(pcszDstFilePath)
+                        if (    vsdeHD->strVbox.isEmpty()
+                             || RTPathExists(vsdeHD->strVbox.c_str())
                            )
                             /* This isn't allowed */
                             throw setError(VBOX_E_FILE_ERROR,
                                            tr("Destination file '%s' exists",
-                                              pcszDstFilePath));
+                                              vsdeHD->strVbox.c_str()));
 
                         /* Find the disk from the OVF's disk list */
@@ -1581 +1580 @@
 
                         /* Make sure all target directories exists */
-                        rc = VirtualBox::ensureFilePathExists(pcszDstFilePath);
+                        rc = VirtualBox::ensureFilePathExists(vsdeHD->strVbox.c_str());
                         if (FAILED(rc))
                             throw rc;
@@ -1598 +1597 @@
                                 srcFormat = L"VMDK";
                             /* Create an empty hard disk */
-                            rc = mVirtualBox->CreateHardDisk(srcFormat, Bstr(pcszDstFilePath), dstHdVBox.asOutParam());
+                            rc = mVirtualBox->CreateHardDisk(srcFormat, Bstr(vsdeHD->strVbox), dstHdVBox.asOutParam());
                             if (FAILED(rc)) throw rc;
 
@@ -1607 +1606 @@
                             /* Advance to the next operation */
                             if (!pTask->progress.isNull())
-                                pTask->progress->setNextOperation(BstrFmt(tr("Creating virtual disk image '%s'"), pcszDstFilePath),
+                                pTask->progress->setNextOperation(BstrFmt(tr("Creating virtual disk image '%s'"), vsdeHD->strVbox.c_str()),
                                                                  vsdeHD->ulSizeMB);     // operation's weight, as set up with the IProgress originally
                         }
@@ -1638 +1637 @@
                             if (FAILED(rc)) throw rc;
                             /* Create a new hard disk interface for the destination disk image */
-                            rc = mVirtualBox->CreateHardDisk(srcFormat, Bstr(pcszDstFilePath), dstHdVBox.asOutParam());
+                            rc = mVirtualBox->CreateHardDisk(srcFormat, Bstr(vsdeHD->strVbox), dstHdVBox.asOutParam());
                             if (FAILED(rc)) throw rc;
                             /* Clone the source disk image */
@@ -1725 +1724 @@
                         }
 
-                        Log(("Attaching disk %s to channel %d on device %d\n", pcszDstFilePath, mhda.lChannel, mhda.lDevice));
+                        Log(("Attaching disk %s to channel %d on device %d\n", vsdeHD->strVbox.c_str(), mhda.lChannel, mhda.lDevice));
 
                         rc = sMachine->AttachHardDisk(hdId,
@@ -1882 +1881 @@
                 {
                     /* The temporary name of the target disk file */
-                    Utf8StrFmt strTmpDisk("%s/%s", pszTmpDir, RTPathFilename(strTargetFile));
+                    Utf8StrFmt strTmpDisk("%s/%s", pszTmpDir, RTPathFilename(strTargetFile.c_str()));
                     filesList.push_back(pair<Utf8Str, ULONG>(strTmpDisk, (*itH)->ulSizeMB));
                 }
@@ -1925 +1924 @@
         /* Provide a OVF file (haven't to exist) so the import routine can
          * figure out where the disk images/manifest file are located. */
-        Utf8StrFmt strTmpOvf("%s/%s", pszTmpDir, RTPathFilename(tmpPath));
+        Utf8StrFmt strTmpOvf("%s/%s", pszTmpDir, RTPathFilename(tmpPath.c_str()));
         /* Now check if there is an manifest file. This is optional. */
         Utf8Str strManifestFile = manifestFileName(strTmpOvf);
@@ -2976 +2975 @@
 
         /* The temporary name of the target OVF file */
-        Utf8StrFmt strTmpOvf("%s/%s", pszTmpDir, RTPathFilename(tmpPath));
+        Utf8StrFmt strTmpOvf("%s/%s", pszTmpDir, RTPathFilename(tmpPath.c_str()));
 
         /* Prepare the temporary writing of the OVF */

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -361 +361 @@
  *  @note Locks this object for writing.
  */
-HRESULT AudioAdapter::loadSettings (const settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT AudioAdapter::loadSettings(const settings::AudioAdapter &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -383 +379 @@
      * default to B. */
 
-    /* AudioAdapter node (required) */
-    Key audioAdapterNode = aMachineNode.key ("AudioAdapter");
-
-    /* is the adapter enabled? (required) */
-    mData->mEnabled = audioAdapterNode.value <bool> ("enabled");
-
-    /* now check the audio adapter */
-    const char *controller = audioAdapterNode.stringValue ("controller");
-    if (strcmp (controller, "SB16") == 0)
-        mData->mAudioController = AudioControllerType_SB16;
-    else if (strcmp (controller, "AC97") == 0)
-        mData->mAudioController = AudioControllerType_AC97;
-
-    /* now check the audio driver (required) */
-    const char *driver = audioAdapterNode.stringValue ("driver");
-    if      (strcmp (driver, "Null") == 0)
-        mData->mAudioDriver = AudioDriverType_Null;
-#ifdef RT_OS_WINDOWS
-    else if (strcmp (driver, "WinMM") == 0)
-#ifdef VBOX_WITH_WINMM
-        mData->mAudioDriver = AudioDriverType_WinMM;
-#else
-        /* fall back to dsound */
-        mData->mAudioDriver = AudioDriverType_DirectSound;
-#endif
-    else if (strcmp (driver, "DirectSound") == 0)
-        mData->mAudioDriver = AudioDriverType_DirectSound;
-#endif // RT_OS_WINDOWS
-#ifdef RT_OS_SOLARIS
-    else if (strcmp (driver, "SolAudio") == 0)
-        mData->mAudioDriver = AudioDriverType_SolAudio;
-#endif // RT_OS_SOLARIS
-#ifdef RT_OS_LINUX
-    else if (strcmp (driver, "ALSA") == 0)
-# ifdef VBOX_WITH_ALSA
-        mData->mAudioDriver = AudioDriverType_ALSA;
-# else
-        /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSS;
-# endif
-    else if (strcmp (driver, "Pulse") == 0)
-# ifdef VBOX_WITH_PULSE
-        mData->mAudioDriver = AudioDriverType_Pulse;
-# else
-        /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSS;
-# endif
-#endif // RT_OS_LINUX
-#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
-    else if (strcmp (driver, "OSS") == 0)
-        mData->mAudioDriver = AudioDriverType_OSS;
-#endif // RT_OS_LINUX || RT_OS_FREEBSD
-#ifdef RT_OS_DARWIN
-    else if (strcmp (driver, "CoreAudio") == 0)
-        mData->mAudioDriver = AudioDriverType_CoreAudio;
-#endif
-#ifdef RT_OS_OS2
-    else if (strcmp (driver, "MMPM") == 0)
-        mData->mAudioDriver = AudioDriverType_MMPM;
-#endif
-    else
-        AssertMsgFailed (("Invalid driver '%s'\n", driver));
+    mData->mEnabled = data.fEnabled;
+    mData->mAudioController = data.controllerType;
+    mData->mAudioDriver = data.driverType;
 
     return S_OK;
@@ -456 +393 @@
  *  @note Locks this object for reading.
  */
-HRESULT AudioAdapter::saveSettings (settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT AudioAdapter::saveSettings(settings::AudioAdapter &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -467 +400 @@
     AutoReadLock alock(this);
 
-    Key node = aMachineNode.createKey ("AudioAdapter");
-
-    const char *controllerStr = NULL;
-    switch (mData->mAudioController)
-    {
-        case AudioControllerType_SB16:
-        {
-            controllerStr = "SB16";
-            break;
-        }
-        default:
-        {
-            controllerStr = "AC97";
-            break;
-        }
-    }
-    node.setStringValue ("controller", controllerStr);
-
-    const char *driverStr = NULL;
-    switch (mData->mAudioDriver)
-    {
-        case AudioDriverType_Null:
-        {
-            driverStr = "Null";
-            break;
-        }
-#ifdef RT_OS_WINDOWS
-            case AudioDriverType_WinMM:
-# ifdef VBOX_WITH_WINMM
-            {
-                driverStr = "WinMM";
-                break;
-            }
-# endif
-            case AudioDriverType_DirectSound:
-            {
-                driverStr = "DirectSound";
-                break;
-            }
-#endif /* RT_OS_WINDOWS */
-#ifdef RT_OS_SOLARIS
-            case AudioDriverType_SolAudio:
-            {
-                driverStr = "SolAudio";
-                break;
-            }
-#endif
-#ifdef RT_OS_LINUX
-            case AudioDriverType_ALSA:
-# ifdef VBOX_WITH_ALSA
-            {
-                driverStr = "ALSA";
-                break;
-            }
-# endif
-            case AudioDriverType_Pulse:
-# ifdef VBOX_WITH_PULSE
-            {
-                driverStr = "Pulse";
-                break;
-            }
-# endif
-#endif /* RT_OS_LINUX */
-#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
-            case AudioDriverType_OSS:
-            {
-                driverStr = "OSS";
-                break;
-            }
-#endif /* RT_OS_LINUX || RT_OS_FREEBSD */
-#ifdef RT_OS_DARWIN
-            case AudioDriverType_CoreAudio:
-            {
-                driverStr = "CoreAudio";
-                break;
-            }
-#endif
-#ifdef RT_OS_OS2
-            case AudioDriverType_MMPM:
-            {
-                driverStr = "MMPM";
-                break;
-            }
-#endif
-            default:
-                ComAssertMsgFailedRet (("Wrong audio driver type! driver = %d",
-                                        mData->mAudioDriver),
-                                       E_FAIL);
-    }
-    node.setStringValue ("driver", driverStr);
-
-    node.setValue <bool> ("enabled", !!mData->mEnabled);
-
+    data.fEnabled = mData->mEnabled;
+    data.controllerType = mData->mAudioController;
+    data.driverType = mData->mAudioDriver;
     return S_OK;
 }

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -459 +459 @@
  *  @note Locks this object for writing.
  */
-HRESULT BIOSSettings::loadSettings (const settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT BIOSSettings::loadSettings(const settings::BIOSSettings &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -470 +466 @@
     AutoWriteLock alock(this);
 
-    /* Note: we assume that the default values for attributes of optional
-     * nodes are assigned in the Data::Data() constructor and don't do it
-     * here. It implies that this method may only be called after constructing
-     * a new BIOSSettings object while all its data fields are in the default
-     * values. Exceptions are fields whose creation time defaults don't match
-     * values that should be applied when these fields are not explicitly set
-     * in the settings file (for backwards compatibility reasons). This takes
-     * place when a setting of a newly created object must default to A while
-     * the same setting of an object loaded from the old settings file must
-     * default to B. */
-
-    /* BIOS node (required) */
-    Key biosNode = aMachineNode.key ("BIOS");
-
-    /* ACPI (required) */
-    {
-        Key acpiNode = biosNode.key ("ACPI");
-
-        mData->mACPIEnabled = acpiNode.value <bool> ("enabled");
-    }
-
-    /* IOAPIC (optional) */
-    {
-        Key ioapicNode = biosNode.findKey ("IOAPIC");
-        if (!ioapicNode.isNull())
-            mData->mIOAPICEnabled = ioapicNode.value <bool> ("enabled");
-    }
-
-    /* Logo (optional) */
-    {
-        Key logoNode = biosNode.findKey ("Logo");
-        if (!logoNode.isNull())
-        {
-            mData->mLogoFadeIn = logoNode.value <bool> ("fadeIn");
-            mData->mLogoFadeOut = logoNode.value <bool> ("fadeOut");
-            mData->mLogoDisplayTime = logoNode.value <ULONG> ("displayTime");
-            mData->mLogoImagePath = logoNode.stringValue ("imagePath");
-        }
-    }
-
-    /* boot menu (optional) */
-    {
-        Key bootMenuNode = biosNode.findKey ("BootMenu");
-        if (!bootMenuNode.isNull())
-        {
-            mData->mBootMenuMode = BIOSBootMenuMode_MessageAndMenu;
-            const char *modeStr = bootMenuNode.stringValue ("mode");
-
-            if (strcmp (modeStr, "Disabled") == 0)
-                mData->mBootMenuMode = BIOSBootMenuMode_Disabled;
-            else if (strcmp (modeStr, "MenuOnly") == 0)
-                mData->mBootMenuMode = BIOSBootMenuMode_MenuOnly;
-            else if (strcmp (modeStr, "MessageAndMenu") == 0)
-                mData->mBootMenuMode = BIOSBootMenuMode_MessageAndMenu;
-            else
-                ComAssertMsgFailedRet (("Invalid boot menu mode '%s'", modeStr),
-                                       E_FAIL);
-        }
-    }
-
-    /* PXE debug logging (optional) */
-    {
-        Key pxedebugNode = biosNode.findKey ("PXEDebug");
-        if (!pxedebugNode.isNull())
-            mData->mPXEDebugEnabled = pxedebugNode.value <bool> ("enabled");
-    }
-
-    /* time offset (optional) */
-    {
-        Key timeOffsetNode = biosNode.findKey ("TimeOffset");
-        if (!timeOffsetNode.isNull())
-            mData->mTimeOffset = timeOffsetNode.value <LONG64> ("value");
-    }
+    mData->mACPIEnabled = data.fACPIEnabled;
+    mData->mIOAPICEnabled = data.fIOAPICEnabled;
+
+    mData->mLogoFadeIn = data.fLogoFadeIn;
+    mData->mLogoFadeOut = data.fLogoFadeOut;
+    mData->mLogoDisplayTime = data.ulLogoDisplayTime;
+    mData->mLogoImagePath = data.strLogoImagePath;
+
+    mData->mBootMenuMode = data.biosBootMenuMode;
+
+    mData->mPXEDebugEnabled = data.fPXEDebugEnabled;
+    mData->mTimeOffset = data.llTimeOffset;
 
     return S_OK;
@@ -554 +489 @@
  *  @note Locks this object for reading.
  */
-HRESULT BIOSSettings::saveSettings (settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT BIOSSettings::saveSettings(settings::BIOSSettings &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -565 +496 @@
     AutoReadLock alock(this);
 
-    Key biosNode = aMachineNode.createKey ("BIOS");
-
-    /* ACPI */
-    {
-        Key acpiNode = biosNode.createKey ("ACPI");
-        acpiNode.setValue <bool> ("enabled", !!mData->mACPIEnabled);
-    }
-
-    /* IOAPIC */
-    {
-        Key ioapicNode = biosNode.createKey ("IOAPIC");
-        ioapicNode.setValue <bool> ("enabled", !!mData->mIOAPICEnabled);
-    }
-
-    /* BIOS logo (optional) **/
-    {
-        Key logoNode = biosNode.createKey ("Logo");
-        logoNode.setValue <bool> ("fadeIn", !!mData->mLogoFadeIn);
-        logoNode.setValue <bool> ("fadeOut", !!mData->mLogoFadeOut);
-        logoNode.setValue <ULONG> ("displayTime", mData->mLogoDisplayTime);
-        logoNode.setValueOr <Bstr> ("imagePath", mData->mLogoImagePath, Bstr::Null);
-    }
-
-    /* boot menu (optional) */
-    {
-        Key bootMenuNode = biosNode.createKey ("BootMenu");
-        const char *modeStr = NULL;
-        switch (mData->mBootMenuMode)
-        {
-            case BIOSBootMenuMode_Disabled:
-                modeStr = "Disabled";
-                break;
-            case BIOSBootMenuMode_MenuOnly:
-                modeStr = "MenuOnly";
-                break;
-            case BIOSBootMenuMode_MessageAndMenu:
-                modeStr = "MessageAndMenu";
-                break;
-            default:
-                ComAssertMsgFailedRet (("Invalid boot menu type: %d",
-                                        mData->mBootMenuMode),
-                                       E_FAIL);
-        }
-        bootMenuNode.setStringValue ("mode", modeStr);
-    }
-
-    /* time offset (optional) */
-    {
-        Key timeOffsetNode = biosNode.createKey ("TimeOffset");
-        timeOffsetNode.setValue <LONG64> ("value", mData->mTimeOffset);
-    }
-
-    /* PXE debug flag (optional) */
-    {
-        Key pxedebugNode = biosNode.createKey ("PXEDebug");
-        pxedebugNode.setValue <bool> ("enabled", !!mData->mPXEDebugEnabled);
-    }
+    data.fACPIEnabled = !!mData->mACPIEnabled;
+    data.fIOAPICEnabled = !!mData->mIOAPICEnabled;
+
+    data.fLogoFadeIn = !!mData->mLogoFadeIn;
+    data.fLogoFadeOut = !!mData->mLogoFadeOut;
+    data.ulLogoDisplayTime = mData->mLogoDisplayTime;
+    data.strLogoImagePath = mData->mLogoImagePath;
+
+    data.biosBootMenuMode = mData->mBootMenuMode;
+    data.fPXEDebugEnabled = !!mData->mPXEDebugEnabled;
+    data.llTimeOffset = mData->mTimeOffset;
 
     return S_OK;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -956 +956 @@
 
     PSSMHANDLE ssm;
-    int vrc = SSMR3Open (Utf8Str(savedStateFile), 0, &ssm);
+    int vrc = SSMR3Open(Utf8Str(savedStateFile).c_str(), 0, &ssm);
     if (VBOX_SUCCESS (vrc))
     {
@@ -1020 +1020 @@
         vrc = SSMR3PutU32 (pSSM, (uint32_t)name.length() + 1 /* term. 0 */);
         AssertRC (vrc);
-        vrc = SSMR3PutStrZ (pSSM, name);
+        vrc = SSMR3PutStrZ(pSSM, name.c_str());
         AssertRC (vrc);
 
@@ -1026 +1026 @@
         vrc = SSMR3PutU32 (pSSM, (uint32_t)hostPath.length() + 1 /* term. 0 */);
         AssertRC (vrc);
-        vrc = SSMR3PutStrZ (pSSM, hostPath);
+        vrc = SSMR3PutStrZ (pSSM, hostPath.c_str());
         AssertRC (vrc);
 
@@ -1846 +1846 @@
             Utf8Str dir = stateFilePath;
             dir.stripFilename();
-            if (!RTDirExists(dir))
+            if (!RTDirExists(dir.c_str()))
             {
-                int vrc = RTDirCreateFullPath (dir, 0777);
+                int vrc = RTDirCreateFullPath(dir.c_str(), 0777);
                 if (VBOX_FAILURE (vrc))
                 {
@@ -3322 +3322 @@
                                            (unsigned) ulInstance, 0, &pBase);
             ComAssertRC (vrc);
-            if (VBOX_SUCCESS (vrc))
+            if (VBOX_SUCCESS(vrc))
             {
                 Assert(pBase);
@@ -3334 +3334 @@
                                                      fCableConnected ? PDMNETWORKLINKSTATE_UP
                                                                      : PDMNETWORKLINKSTATE_DOWN);
-                    ComAssertRC (vrc);
+                    ComAssertRC(vrc);
                 }
             }
@@ -4507 +4507 @@
     /* make sure the Logs folder exists */
     Assert(logDir.length());
-    if (!RTDirExists (logDir))
-        RTDirCreateFullPath (logDir, 0777);
-
-    Utf8Str logFile = Utf8StrFmt ("%s%cVBox.log",
-                                  logDir.raw(), RTPATH_DELIMITER);
-    Utf8Str pngFile = Utf8StrFmt ("%s%cVBox.png",
-                                  logDir.raw(), RTPATH_DELIMITER);
+    if (!RTDirExists(logDir.c_str()))
+        RTDirCreateFullPath(logDir.c_str(), 0777);
+
+    Utf8Str logFile = Utf8StrFmt("%s%cVBox.log",
+                                 logDir.raw(), RTPATH_DELIMITER);
+    Utf8Str pngFile = Utf8StrFmt("%s%cVBox.png",
+                                 logDir.raw(), RTPATH_DELIMITER);
 
     /*
@@ -4548 +4548 @@
                  * exists) to provide correct rotation even if the sequence is
                  * broken */
-                if (   RTFileRename (oldName, newName, RTFILEMOVE_FLAGS_REPLACE)
+                if (   RTFileRename(oldName.c_str(), newName.c_str(), RTFILEMOVE_FLAGS_REPLACE)
                     == VERR_FILE_NOT_FOUND)
-                    RTFileDelete (newName);
+                    RTFileDelete(newName.c_str());
             }
         }
@@ -4726 +4726 @@
         CheckComRCReturnRC(rc);
         ComAssertRet (!!savedStateFile, E_FAIL);
-        int vrc = SSMR3ValidateFile (Utf8Str (savedStateFile), false /* fChecksumIt */);
-        if (VBOX_FAILURE (vrc))
-            return setError (VBOX_E_FILE_ERROR,
-                tr ("VM cannot start because the saved state file '%ls' is invalid (%Rrc). "
-                    "Discard the saved state prior to starting the VM"),
-                    savedStateFile.raw(), vrc);
+        int vrc = SSMR3ValidateFile(Utf8Str(savedStateFile).c_str(), false /* fChecksumIt */);
+        if (VBOX_FAILURE(vrc))
+            return setError(VBOX_E_FILE_ERROR,
+                            tr("VM cannot start because the saved state file '%ls' is invalid (%Rrc). "
+                               "Discard the saved state prior to starting the VM"),
+                            savedStateFile.raw(), vrc);
     }
 
@@ -6685 +6685 @@
             LogRel (("Failed to launch VRDP server (%Rrc), error message: '%s'\n",
                      vrc, errMsg.raw()));
-            throw setError (E_FAIL, errMsg);
+            throw setError(E_FAIL, errMsg.c_str());
         }
 
@@ -6785 +6785 @@
                                   task->mSavedStateFile.raw()));
 
-                    vrc = VMR3Load (pVM, task->mSavedStateFile,
-                                    Console::stateProgressCallback,
-                                    static_cast <VMProgressTask *> (task.get()));
+                    vrc = VMR3Load(pVM,
+                                   task->mSavedStateFile.c_str(),
+                                   Console::stateProgressCallback,
+                                   static_cast<VMProgressTask*>(task.get()));
 
                     if (VBOX_SUCCESS (vrc))
@@ -6878 +6879 @@
             /* Set the error message as the COM error.
              * Progress::notifyComplete() will pick it up later. */
-            throw setError (E_FAIL, task->mErrorMsg);
+            throw setError(E_FAIL, task->mErrorMsg.c_str());
         }
     }
@@ -7094 +7095 @@
     hrc = hardDisk->COMGETTER(Location)(bstr.asOutParam());                     H();
     LogFlowFunc (("LUN#%d: leaf location '%ls'\n", iLUN, bstr.raw()));
-    rc = CFGMR3InsertString(pCfg, "Path", Utf8Str(bstr));                       RC_CHECK();
+    rc = CFGMR3InsertString(pCfg, "Path", Utf8Str(bstr).c_str());                       RC_CHECK();
     hrc = hardDisk->COMGETTER(Format)(bstr.asOutParam());                       H();
     LogFlowFunc (("LUN#%d: leaf format '%ls'\n", iLUN, bstr.raw()));
-    rc = CFGMR3InsertString(pCfg, "Format", Utf8Str(bstr));                     RC_CHECK();
+    rc = CFGMR3InsertString(pCfg, "Format", Utf8Str(bstr).c_str());                     RC_CHECK();
 
     /* Pass all custom parameters. */
@@ -7115 +7116 @@
             if (values [i])
             {
-                Utf8Str name = names [i];
-                Utf8Str value = values [i];
-                rc = CFGMR3InsertString (pVDC, name, value);
+                Utf8Str name = names[i];
+                Utf8Str value = values[i];
+                rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str());
                 if (    !(name.compare("HostIPStack"))
                     &&  !(value.compare("0")))
@@ -7136 +7137 @@
         rc = CFGMR3InsertNode(pParent, "Parent", &pCur);                        RC_CHECK();
         hrc = hardDisk->COMGETTER(Location)(bstr.asOutParam());                 H();
-        rc = CFGMR3InsertString(pCur,  "Path", Utf8Str(bstr));                  RC_CHECK();
+        rc = CFGMR3InsertString(pCur,  "Path", Utf8Str(bstr).c_str());          RC_CHECK();
 
         hrc = hardDisk->COMGETTER(Format)(bstr.asOutParam());                   H();
-        rc = CFGMR3InsertString(pCur,  "Format", Utf8Str(bstr));                RC_CHECK();
+        rc = CFGMR3InsertString(pCur,  "Format", Utf8Str(bstr).c_str());        RC_CHECK();
 
         /* Pass all custom parameters. */
@@ -7158 +7159 @@
                     Utf8Str name = names [i];
                     Utf8Str value = values [i];
-                    rc = CFGMR3InsertString (pVDC, name, value);
+                    rc = CFGMR3InsertString (pVDC, name.c_str(), value.c_str());
                     if (    !(name.compare("HostIPStack"))
                         &&  !(value.compare("0")))
@@ -7241 +7242 @@
         LogFlowFunc (("Saving the state to '%s'...\n", task->mSavedStateFile.raw()));
 
-        int vrc = VMR3Save (that->mpVM, task->mSavedStateFile,
-                            Console::stateProgressCallback,
-                            static_cast <VMProgressTask *> (task.get()));
+        int vrc = VMR3Save(that->mpVM,
+                           task->mSavedStateFile.c_str(),
+                           Console::stateProgressCallback,
+                           static_cast<VMProgressTask*>(task.get()));
         if (VBOX_FAILURE (vrc))
         {
@@ -7370 +7372 @@
                                             COM_IIDOF(IConsole),
                                             Console::getComponentName(),
-                                            errMsg);
+                                            errMsg.c_str());
         else
             task->mProgress->notifyComplete (rc);

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -227 +227 @@
     rc = CFGMR3InsertInteger(pRoot, "RamHoleSize",          cbRamHole);             RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "NumCPUs",              cCpus);                 RC_CHECK();
-    rc = CFGMR3InsertString (pRoot, "OSType",               Utf8Str(osTypeId));     RC_CHECK();
+    rc = CFGMR3InsertString (pRoot, "OSType",               Utf8Str(osTypeId).c_str()); RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "TimerMillies",         10);                    RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled",         1);     /* boolean */   RC_CHECK();
@@ -779 +779 @@
     Bstr logoImagePath;
     hrc = biosSettings->COMGETTER(LogoImagePath)(logoImagePath.asOutParam());       H();
-    rc = CFGMR3InsertString(pCfg,   "LogoFile", logoImagePath ? Utf8Str(logoImagePath) : ""); RC_CHECK();
+    rc = CFGMR3InsertString(pCfg,   "LogoFile", logoImagePath ? Utf8Str(logoImagePath).c_str() : ""); RC_CHECK();
 
     /*
@@ -1102 +1102 @@
                         Utf8Str name = names[ii];
                         Utf8Str value = values[ii];
-                        rc = CFGMR3InsertString(pVDC, name, value);
+                        rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str());
                         if (    name.compare("HostIPStack") == 0
                             &&  value.compare("0") == 0)
@@ -1145 +1145 @@
                             Utf8Str name = names[ii];
                             Utf8Str value = values[ii];
-                            rc = CFGMR3InsertString(pVDC, name, value);
+                            rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str());
                             if (    name.compare("HostIPStack") == 0
                                 &&  value.compare("0") == 0)
@@ -1907 +1907 @@
      */
     /** @todo add support for removing nodes and byte blobs. */
-    Bstr strExtraDataKey;
-    bool fGlobalExtraData = true;
-    for (;;)
-    {
+    SafeArray<BSTR> aGlobalExtraDataKeys;
+    SafeArray<BSTR> aMachineExtraDataKeys;
+    /*
+        * Get the next key
+        */
+    if (FAILED(hrc = virtualBox->GetExtraDataKeys(ComSafeArrayAsOutParam(aGlobalExtraDataKeys))))
+        AssertMsgFailed(("VirtualBox::GetExtraDataKeys failed with %Rrc\n", hrc));
+    size_t cGlobalValues = aGlobalExtraDataKeys.size();
+    if (FAILED(hrc = pMachine->GetExtraDataKeys(ComSafeArrayAsOutParam(aMachineExtraDataKeys))))
+        AssertMsgFailed(("IMachine::GetExtraDataKeys failed with %Rrc\n", hrc));
+
+    // build a combined list, prefix global keys with "G:"...
+    std::list<Utf8Str> llExtraDataKeys;
+    size_t i;
+    for (i = 0; i < aGlobalExtraDataKeys.size(); ++i)
+        llExtraDataKeys.push_back(Utf8Str(aGlobalExtraDataKeys[i]));
+    // ... and machine keys with "M:" (so we know below which method to call)
+    for (i = 0; i < aMachineExtraDataKeys.size(); ++i)
+        llExtraDataKeys.push_back(Utf8Str(aMachineExtraDataKeys[i]));
+    i = 0;
+    for (std::list<Utf8Str>::const_iterator it = llExtraDataKeys.begin();
+         it != llExtraDataKeys.end();
+         ++it, ++i)
+    {
+        const Utf8Str &strKey = *it;
+
         /*
-         * Get the next key
+         * We only care about keys starting with "VBoxInternal/" (skip "G:" or "M:")
          */
-        Bstr strNextExtraDataKey;
+        if (!strKey.startsWith("VBoxInternal/"))
+            continue;
+
+        const char *pszExtraDataKey = strKey.raw() + sizeof("VBoxInternal/") - 1;
+
+        // get the value
         Bstr strExtraDataValue;
-        if (fGlobalExtraData)
-            hrc = virtualBox->GetNextExtraDataKey(strExtraDataKey, strNextExtraDataKey.asOutParam(),
-                                                  strExtraDataValue.asOutParam());
+        if (i < cGlobalValues)
+            // this is still one of the global values:
+            hrc = virtualBox->GetExtraData(Bstr(strKey), strExtraDataValue.asOutParam());
         else
-            hrc = pMachine->GetNextExtraDataKey(strExtraDataKey, strNextExtraDataKey.asOutParam(),
-                                                strExtraDataValue.asOutParam());
-
-        /* stop if for some reason there's nothing more to request */
-        if (FAILED(hrc) || strNextExtraDataKey.isEmpty())
-        {
-            /* if we're out of global keys, continue with machine, otherwise we're done */
-            if (fGlobalExtraData)
-            {
-                fGlobalExtraData = false;
-                strExtraDataKey.setNull();
-                continue;
-            }
-            break;
-        }
-        strExtraDataKey = strNextExtraDataKey;
-
-        /*
-         * We only care about keys starting with "VBoxInternal/"
-         */
-        Utf8Str strExtraDataKeyUtf8(strExtraDataKey);
-        char *pszExtraDataKey = (char *)strExtraDataKeyUtf8.raw();
-        if (strncmp(pszExtraDataKey, "VBoxInternal/", sizeof("VBoxInternal/") - 1) != 0)
-            continue;
-        pszExtraDataKey += sizeof("VBoxInternal/") - 1;
+            hrc = pMachine->GetExtraData(Bstr(strKey), strExtraDataValue.asOutParam());
+        if (FAILED(hrc))
+            LogRel(("Warning: Cannot get extra data key %s, rc = %Rrc\n", strKey.raw(), hrc));
 
         /*
@@ -1952 +1957 @@
          */
         PCFGMNODE pNode;
-        char *pszCFGMValueName = strrchr(pszExtraDataKey, '/');
+        const char *pszCFGMValueName = strrchr(pszExtraDataKey, '/');
         if (pszCFGMValueName)
         {
             /* terminate the node and advance to the value (Utf8Str might not
                offically like this but wtf) */
-            *pszCFGMValueName = '\0';
+            *(char*)pszCFGMValueName = '\0';
             pszCFGMValueName++;
 

trunk/src/VBox/Main/DHCPServerImpl.cpp

@@ -86 +86 @@
 }
 
-HRESULT DHCPServer::init(VirtualBox *aVirtualBox, const settings::Key &aNode)
-{
-    using namespace settings;
-
+HRESULT DHCPServer::init(VirtualBox *aVirtualBox,
+                         const settings::DHCPServer &data)
+{
     /* Enclose the state transition NotReady->InInit->Ready */
     AutoInitSpan autoInitSpan(this);
@@ -99 +98 @@
     aVirtualBox->addDependentChild (this);
 
-    unconst(mName) = aNode.stringValue ("networkName");
-    m.IPAddress = aNode.stringValue ("IPAddress");
-    m.networkMask = aNode.stringValue ("networkMask");
-    m.enabled = aNode.value <bool> ("enabled");
-    m.lowerIP = aNode.stringValue ("lowerIP");
-    m.upperIP = aNode.stringValue ("upperIP");
+    unconst(mName) = data.strNetworkName;
+    m.IPAddress = data.strIPAddress;
+    m.networkMask = data.strIPNetworkMask;
+    m.enabled = data.fEnabled;
+    m.lowerIP = data.strIPLower;
+    m.upperIP = data.strIPUpper;
 
     autoInitSpan.setSucceeded();
@@ -111 +110 @@
 }
 
-HRESULT DHCPServer::saveSettings (settings::Key &aParentNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aParentNode.isNull(), E_FAIL);
-
+HRESULT DHCPServer::saveSettings(settings::DHCPServer &data)
+{
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -122 +117 @@
     AutoReadLock alock(this);
 
-    Key aNode = aParentNode.appendKey ("DHCPServer");
-    /* required */
-    aNode.setValue <Bstr> ("networkName", mName);
-    aNode.setValue <Bstr> ("IPAddress", m.IPAddress);
-    aNode.setValue <Bstr> ("networkMask", m.networkMask);
-    aNode.setValue <Bstr> ("lowerIP", m.lowerIP);
-    aNode.setValue <Bstr> ("upperIP", m.upperIP);
-    /* To force it back to a numeric value; will otherwise break for 2.2.x. */
-    aNode.setValue <ULONG> ("enabled", m.enabled);
+    data.strNetworkName = mName;
+    data.strIPAddress = m.IPAddress;
+    data.strIPNetworkMask = m.networkMask;
+    data.fEnabled = m.enabled;
+    data.strIPLower = m.lowerIP;
+    data.strIPUpper = m.upperIP;
 
     return S_OK;
@@ -243 +235 @@
 }
 
-STDMETHODIMP DHCPServer::Start (IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType)
+STDMETHODIMP DHCPServer::Start(IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType)
 {
     /* Silently ignore attepmts to run disabled servers. */

trunk/src/VBox/Main/DVDDriveImpl.cpp

@@ -411 +411 @@
  * @note Locks this object for writing.
  */
-HRESULT DVDDrive::loadSettings (const settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT DVDDrive::loadSettings(const settings::DVDDrive &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -435 +431 @@
     HRESULT rc = S_OK;
 
-    /* DVD drive (required, contains either Image or HostDrive or nothing) */
-    Key dvdDriveNode = aMachineNode.key ("DVDDrive");
-
     /* optional, defaults to false */
-    m->passthrough = dvdDriveNode.value <bool> ("passthrough");
-
-    Key typeNode;
-
-    if (!(typeNode = dvdDriveNode.findKey ("Image")).isNull())
-    {
-        Guid uuid = typeNode.value <Guid> ("uuid");
-        rc = MountImage (uuid.toUtf16());
-        CheckComRCReturnRC(rc);
-    }
-    else if (!(typeNode = dvdDriveNode.findKey ("HostDrive")).isNull())
-    {
-
-        Bstr src = typeNode.stringValue ("src");
+    m->passthrough = data.fPassThrough;
+
+    if (!data.uuid.isEmpty())
+    {
+        rc = MountImage(data.uuid.toUtf16());
+        CheckComRCReturnRC (rc);
+    }
+    else if (!data.strHostDriveSrc.isEmpty())
+    {
+        Bstr src = data.strHostDriveSrc;
 
         /* find the corresponding object */
@@ -458 +447 @@
 
         com::SafeIfaceArray<IHostDVDDrive> coll;
-        rc = host->COMGETTER(DVDDrives) (ComSafeArrayAsOutParam(coll));
+        rc = host->COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(coll));
         AssertComRC (rc);
 
         ComPtr<IHostDVDDrive> drive;
-        rc = host->FindHostDVDDrive (src, drive.asOutParam());
+        rc = host->FindHostDVDDrive(src, drive.asOutParam());
 
         if (SUCCEEDED(rc))
         {
-            rc = CaptureHostDrive (drive);
+            rc = CaptureHostDrive(drive);
             CheckComRCReturnRC(rc);
         }
@@ -477 +466 @@
             hostDrive.createObject();
             rc = hostDrive->init (src);
-            AssertComRC (rc);
+            AssertComRC(rc);
             rc = CaptureHostDrive (hostDrive);
             CheckComRCReturnRC(rc);
@@ -489 +478 @@
         }
         else
-            AssertComRC (rc);
+            AssertComRC(rc);
     }
 
@@ -502 +491 @@
  * @note Locks this object for reading.
  */
-HRESULT DVDDrive::saveSettings (settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT DVDDrive::saveSettings(settings::DVDDrive &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -513 +498 @@
     AutoReadLock alock(this);
 
-    Key node = aMachineNode.createKey ("DVDDrive");
-
-    node.setValue <bool> ("passthrough", !!m->passthrough);
+    data.fPassThrough = !!m->passthrough;
+
+    HRESULT  rc = S_OK;
 
     switch (m->state)
@@ -524 +509 @@
 
             Bstr id;
-            HRESULT rc = m->image->COMGETTER(Id) (id.asOutParam());
+            rc = m->image->COMGETTER(Id) (id.asOutParam());
             AssertComRC (rc);
             Assert (!id.isEmpty());
 
-            Key imageNode = node.createKey ("Image");
-            imageNode.setValue <Guid> ("uuid", Guid(id));
+            data.uuid = Guid(id);
+            data.strHostDriveSrc.setNull();
             break;
         }
@@ -537 +522 @@
 
             Bstr name;
-            HRESULT  rc = m->hostDrive->COMGETTER(Name) (name.asOutParam());
+            rc = m->hostDrive->COMGETTER(Name)(name.asOutParam());
             AssertComRC (rc);
             Assert (!name.isEmpty());
 
-            Key hostDriveNode = node.createKey ("HostDrive");
-            hostDriveNode.setValue <Bstr> ("src", name);
+            data.uuid.clear();
+            data.strHostDriveSrc = name;
             break;
         }
         case DriveState_NotMounted:
             /* do nothing, i.e.leave the drive node empty */
-            break;
+            data.uuid.clear();
+            data.strHostDriveSrc.setNull();
+        break;
         default:
             ComAssertMsgFailedRet (("Invalid drive state: %d", m->state),

trunk/src/VBox/Main/FloppyDriveImpl.cpp

@@ -418 +418 @@
  * @note Locks this object for writing.
  */
-HRESULT FloppyDrive::loadSettings (const settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT FloppyDrive::loadSettings(const settings::FloppyDrive &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -442 +438 @@
     HRESULT rc = S_OK;
 
-    /* Floppy drive (required, contains either Image or HostDrive or nothing) */
-    Key floppyDriveNode = aMachineNode.key ("FloppyDrive");
-
     /* optional, defaults to true */
-    m->enabled = floppyDriveNode.value <bool> ("enabled");
-
-    Key typeNode;
-
-    if (!(typeNode = floppyDriveNode.findKey ("Image")).isNull())
-    {
-        Guid uuid = typeNode.value <Guid> ("uuid");
-        rc = MountImage (uuid.toUtf16());
+    m->enabled = data.fEnabled;
+
+    if (!data.uuid.isEmpty())
+    {
+        rc = MountImage(data.uuid.toUtf16());
         CheckComRCReturnRC(rc);
     }
-    else if (!(typeNode = floppyDriveNode.findKey ("HostDrive")).isNull())
-    {
-
-        Bstr src = typeNode.stringValue ("src");
+    else if (!data.strHostDriveSrc.isEmpty())
+    {
+        Bstr src = data.strHostDriveSrc;
 
         /* find the corresponding object */
@@ -502 +491 @@
  * @note Locks this object for reading.
  */
-HRESULT FloppyDrive::saveSettings (settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT FloppyDrive::saveSettings(settings::FloppyDrive &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -513 +498 @@
     AutoReadLock alock(this);
 
-    Key node = aMachineNode.createKey ("FloppyDrive");
-
-    node.setValue <bool> ("enabled", !!m->enabled);
+    data.fEnabled = !!m->enabled;
 
     switch (m->state)
@@ -528 +511 @@
             Assert (!id.isEmpty());
 
-            Key imageNode = node.createKey ("Image");
-            imageNode.setValue <Guid> ("uuid", Guid(id));
+            data.uuid = Guid(id);
+            data.strHostDriveSrc.setNull();
             break;
         }
@@ -541 +524 @@
             Assert (!name.isEmpty());
 
-            Key hostDriveNode = node.createKey ("HostDrive");
-            hostDriveNode.setValue <Bstr> ("src", name);
+            data.uuid.clear();
+            data.strHostDriveSrc = name;
             break;
         }
         case DriveState_NotMounted:
             /* do nothing, i.e.leave the drive node empty */
-            break;
+            data.uuid.clear();
+            data.strHostDriveSrc.setNull();
+        break;
         default:
             ComAssertMsgFailedRet (("Invalid drive state: %d", m->state),

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -22 +22 @@
  */
 
-#include "HardDiskImpl.h"
-
-#include "ProgressImpl.h"
-#include "SystemPropertiesImpl.h"
-
-#include "Logging.h"
-
-#include <VBox/com/array.h>
-#include <VBox/com/SupportErrorInfo.h>
-
-#include <VBox/err.h>
-#include <VBox/settings.h>
-
 #include <iprt/param.h>
 #include <iprt/path.h>
@@ -40 +27 @@
 #include <iprt/tcp.h>
 
+#include <VBox/com/array.h>
+#include <VBox/com/SupportErrorInfo.h>
+
+#include <VBox/err.h>
+#include <VBox/settings.h>
+
 #include <list>
 #include <memory>
+
+#include "HardDiskImpl.h"
+#include "SystemPropertiesImpl.h"
+#include "ProgressImpl.h"
+
+#include "Logging.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -878 +877 @@
         {
             Assert (!m.lastAccessError.isEmpty());
-            rc = setError (E_FAIL, Utf8Str (m.lastAccessError));
+            rc = setError(E_FAIL, Utf8Str(m.lastAccessError).c_str());
         }
         else
@@ -906 +905 @@
  * @note Locks VirtualBox lock for writing, treeLock() for writing.
  */
-HRESULT HardDisk::init (VirtualBox *aVirtualBox,
-                        HardDisk *aParent,
-                        const settings::Key &aNode)
-{
-    using namespace settings;
-
+HRESULT HardDisk::init(VirtualBox *aVirtualBox,
+                       HardDisk *aParent,
+                       const settings::Medium &data)
+{
     AssertReturn(aVirtualBox, E_INVALIDARG);
 
@@ -930 +927 @@
     {
         /* we set mParent */
-        AutoWriteLock treeLock (this->treeLock());
+        AutoWriteLock treeLock(this->treeLock());
 
         mParent = aParent;
@@ -939 +936 @@
      * as inaccessible for now */
     m.state = MediaState_Inaccessible;
-    m.lastAccessError = tr ("Accessibility check was not yet performed");
+    m.lastAccessError = tr("Accessibility check was not yet performed");
 
     /* required */
-    unconst(m.id) = aNode.value <Guid> ("uuid");
+    unconst(m.id) = data.uuid;
 
     /* optional */
-    {
-        settings::Key descNode = aNode.findKey ("Description");
-        if (!descNode.isNull())
-            m.description = descNode.keyStringValue();
-    }
+    m.description = data.strDescription;
 
     /* required */
-    Bstr format = aNode.stringValue ("format");
-    AssertReturn(!format.isNull(), E_FAIL);
-    rc = setFormat (format);
+    AssertReturn(!data.strFormat.isEmpty(), E_FAIL);
+    rc = setFormat(Bstr(data.strFormat));
     CheckComRCReturnRC(rc);
 
     /* optional, only for diffs, default is false */
     if (aParent != NULL)
-        mm.autoReset = aNode.value <bool> ("autoReset");
+        mm.autoReset = data.fAutoReset;
     else
         mm.autoReset = false;
@@ -968 +960 @@
      * compatibility; we can also clean them up from the XML upon next
      * XML format version change if we wish) */
-    Key::List properties = aNode.keys ("Property");
-    for (Key::List::const_iterator it = properties.begin();
-         it != properties.end(); ++ it)
-    {
-        mm.properties [Bstr (it->stringValue ("name"))] =
-            Bstr (it->stringValue ("value"));
+    for (settings::PropertiesMap::const_iterator it = data.properties.begin();
+         it != data.properties.end();
+         ++it)
+    {
+        const Utf8Str &name = it->first;
+        const Utf8Str &value = it->second;
+        mm.properties[Bstr(name)] = Bstr(value);
     }
 
     /* required */
-    Bstr location = aNode.stringValue ("location");
-    rc = setLocation (location);
+    rc = setLocation(data.strLocation);
     CheckComRCReturnRC(rc);
 
     /* type is only for base hard disks */
     if (mParent.isNull())
-    {
-        const char *type = aNode.stringValue ("type");
-        if      (strcmp (type, "Normal") == 0)
-            mm.type = HardDiskType_Normal;
-        else if (strcmp (type, "Immutable") == 0)
-            mm.type = HardDiskType_Immutable;
-        else if (strcmp (type, "Writethrough") == 0)
-            mm.type = HardDiskType_Writethrough;
-        else
-            AssertFailed();
-    }
+        mm.type = data.hdType;
 
     LogFlowThisFunc(("m.locationFull='%ls', mm.format=%ls, m.id={%RTuuid}\n",
@@ -1006 +988 @@
 
     /* load all children */
-    Key::List hardDisks = aNode.keys ("HardDisk");
-    for (Key::List::const_iterator it = hardDisks.begin();
-         it != hardDisks.end(); ++ it)
-    {
-        ComObjPtr<HardDisk> hardDisk;
-        hardDisk.createObject();
-        rc = hardDisk->init(aVirtualBox, this, *it);
+    for (settings::MediaList::const_iterator it = data.llChildren.begin();
+         it != data.llChildren.end();
+         ++it)
+    {
+        const settings::Medium &m = *it;
+
+        ComObjPtr<HardDisk> pHD;
+        pHD.createObject();
+        rc = pHD->init(aVirtualBox,
+                       this,            // parent
+                       m);              // child data
         CheckComRCBreakRC (rc);
 
-        rc = mVirtualBox->registerHardDisk(hardDisk, false /* aSaveRegistry */);
+        rc = mVirtualBox->registerHardDisk(pHD, false /* aSaveRegistry */);
         CheckComRCBreakRC (rc);
     }
@@ -1965 +1951 @@
  * @note Locks this object, treeLock() and children for reading.
  */
-HRESULT HardDisk::saveSettings (settings::Key &aParentNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aParentNode.isNull(), E_FAIL);
-
+HRESULT HardDisk::saveSettings(settings::Medium &data)
+{
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -1979 +1961 @@
     AutoReadLock treeLock (this->treeLock());
 
-    Key diskNode = aParentNode.appendKey ("HardDisk");
-    /* required */
-    diskNode.setValue <Guid> ("uuid", m.id);
-    /* required (note: the original locaiton, not full) */
-    diskNode.setValue <Bstr> ("location", m.location);
-    /* required */
-    diskNode.setValue <Bstr> ("format", mm.format);
+    data.uuid = m.id;
+    data.strLocation = m.location;
+    data.strFormat = mm.format;
+
     /* optional, only for diffs, default is false */
     if (!mParent.isNull())
-        diskNode.setValueOr <bool> ("autoReset", !!mm.autoReset, false);
+        data.fAutoReset = !!mm.autoReset;
+    else
+        data.fAutoReset = false;
+
     /* optional */
-    if (!m.description.isNull())
-    {
-        Key descNode = diskNode.createKey ("Description");
-        descNode.setKeyValue <Bstr> (m.description);
-    }
+    data.strDescription = m.description;
 
     /* optional properties */
+    data.properties.clear();
     for (Data::PropertyMap::const_iterator it = mm.properties.begin();
-         it != mm.properties.end(); ++ it)
+         it != mm.properties.end();
+         ++it)
     {
         /* only save properties that have non-default values */
         if (!it->second.isNull())
         {
-            Key propNode = diskNode.appendKey ("Property");
-            propNode.setValue <Bstr> ("name", it->first);
-            propNode.setValue <Bstr> ("value", it->second);
+            Utf8Str name = it->first;
+            Utf8Str value = it->second;
+            data.properties[name] = value;
         }
     }
@@ -2011 +1991 @@
     /* only for base hard disks */
     if (mParent.isNull())
-    {
-        const char *type =
-            mm.type == HardDiskType_Normal ? "Normal" :
-            mm.type == HardDiskType_Immutable ? "Immutable" :
-            mm.type == HardDiskType_Writethrough ? "Writethrough" : NULL;
-        Assert (type != NULL);
-        diskNode.setStringValue ("type", type);
-    }
+        data.hdType = mm.type;
 
     /* save all children */
     for (List::const_iterator it = children().begin();
          it != children().end();
-         ++ it)
-    {
-        HRESULT rc = (*it)->saveSettings (diskNode);
-        AssertComRCReturnRC(rc);
+         ++it)
+    {
+        settings::Medium m;
+        HRESULT rc = (*it)->saveSettings(m);
+        AssertComRCReturnRC (rc);
+        data.llChildren.push_back(m);
     }
 
@@ -2044 +2019 @@
  *                      the specified location, and -1 otherwise.
  */
-HRESULT HardDisk::compareLocationTo (const char *aLocation, int &aResult)
+HRESULT HardDisk::compareLocationTo(const Utf8Str &strLocation, int &aResult)
 {
     AutoCaller autoCaller(this);
@@ -2057 +2032 @@
     if (mm.formatObj->capabilities() & HardDiskFormatCapabilities_File)
     {
-        Utf8Str location (aLocation);
+        Utf8Str location(strLocation);
 
         /* For locations represented by files, append the default path if
          * only the name is given, and then get the full path. */
-        if (!RTPathHavePath (aLocation))
-        {
-            AutoReadLock propsLock (mVirtualBox->systemProperties());
-            location = Utf8StrFmt ("%ls%c%s",
-                mVirtualBox->systemProperties()->defaultHardDiskFolder().raw(),
-                RTPATH_DELIMITER, aLocation);
-        }
-
-        int vrc = mVirtualBox->calculateFullPath (location, location);
+        if (!RTPathHavePath(strLocation.c_str()))
+            location = Utf8StrFmt("%s%c%s",
+                                  mVirtualBox->getDefaultHardDiskFolder().raw(),
+                                  RTPATH_DELIMITER,
+                                  strLocation.c_str());
+
+        int vrc = mVirtualBox->calculateFullPath(location, location);
         if (RT_FAILURE(vrc))
-            return setError (E_FAIL,
-                tr ("Invalid hard disk storage file location '%s' (%Rrc)"),
-                location.raw(), vrc);
-
-        aResult = RTPathCompare (locationFull, location);
+            return setError(E_FAIL,
+                            tr("Invalid hard disk storage file location '%s' (%Rrc)"),
+                            location.raw(),
+                            vrc);
+
+        aResult = RTPathCompare(locationFull.c_str(), location.c_str());
     }
     else
-        aResult = locationFull.compare (aLocation);
+        aResult = locationFull.compare(strLocation);
 
     return S_OK;
@@ -2097 +2071 @@
     Utf8Str location (m.locationFull);
 
-    Utf8Str name = RTPathFilename (location);
+    Utf8Str name = RTPathFilename(location.c_str());
     return name;
 }
@@ -2362 +2336 @@
 Bstr HardDisk::preferredDiffFormat()
 {
-    Bstr format;
-
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), format);
+    AssertReturn(autoCaller.rc(), "");
 
     /* mm.format is const, no need to lock */
-    format = mm.format;
+    Bstr bstrFormat = mm.format;
 
     /* check that our own format supports diffs */
     if (!(mm.formatObj->capabilities() & HardDiskFormatCapabilities_Differencing))
-    {
         /* use the default format if not */
-        AutoReadLock propsLock (mVirtualBox->systemProperties());
-        format = mVirtualBox->systemProperties()->defaultHardDiskFormat();
-    }
-
-    return format;
+        bstrFormat = mVirtualBox->getDefaultHardDiskFormat();
+
+    return bstrFormat;
 }
 
@@ -2951 +2920 @@
  * @note Must be called from under this object's write lock.
  */
-HRESULT HardDisk::setLocation (CBSTR aLocation)
-{
-    /// @todo so far, we assert but later it makes sense to support null
-    /// locations for hard disks that are not yet created fail to create a
-    /// storage unit instead
-    CheckComArgStrNotEmptyOrNull (aLocation);
+HRESULT HardDisk::setLocation(const Utf8Str &aLocation)
+{
+    AssertReturn(!aLocation.isEmpty(), E_FAIL);
 
     AutoCaller autoCaller(this);
@@ -2978 +2944 @@
         Guid id;
 
-        Utf8Str location (aLocation);
+        Utf8Str location(aLocation);
 
         if (m.state == MediaState_NotCreated)
@@ -2985 +2951 @@
             Assert (mm.formatObj->capabilities() & HardDiskFormatCapabilities_File);
 
-            if (RTPathFilename (location) == NULL)
+            if (RTPathFilename(location.c_str()) == NULL)
             {
                 /* no file name is given (either an empty string or ends with a
@@ -2991 +2957 @@
                  * this */
 
-                ComAssertMsgRet (!mm.formatObj->fileExtensions().empty(),
-                                 ("Must be at least one extension if it is HardDiskFormatCapabilities_File\n"),
-                                 E_FAIL);
+                ComAssertMsgRet(!mm.formatObj->fileExtensions().empty(),
+                                ("Must be at least one extension if it is HardDiskFormatCapabilities_File\n"),
+                                E_FAIL);
 
                 Bstr ext = mm.formatObj->fileExtensions().front();
-                ComAssertMsgRet (!ext.isEmpty(),
-                                 ("Default extension must not be empty\n"),
-                                 E_FAIL);
+                ComAssertMsgRet(!ext.isEmpty(),
+                                ("Default extension must not be empty\n"),
+                                E_FAIL);
 
                 id.create();
 
-                location = Utf8StrFmt ("%s{%RTuuid}.%ls",
-                                       location.raw(), id.raw(), ext.raw());
+                location = Utf8StrFmt("%s{%RTuuid}.%ls",
+                                      location.raw(),
+                                      id.raw(),
+                                      ext.raw());
             }
         }
 
         /* append the default folder if no path is given */
-        if (!RTPathHavePath (location))
-        {
-            AutoReadLock propsLock (mVirtualBox->systemProperties());
-            location = Utf8StrFmt ("%ls%c%s",
-                mVirtualBox->systemProperties()->defaultHardDiskFolder().raw(),
-                RTPATH_DELIMITER,
-                location.raw());
-        }
+        if (!RTPathHavePath(location.c_str()))
+            location = Utf8StrFmt("%s%c%s",
+                                  mVirtualBox->getDefaultHardDiskFolder().raw(),
+                                  RTPATH_DELIMITER,
+                                  location.raw());
 
         /* get the full file name */
@@ -3033 +2998 @@
             {
                 RTFILE file;
-                vrc = RTFileOpen (&file, locationFull, RTFILE_O_READ);
+                vrc = RTFileOpen(&file, locationFull.c_str(), RTFILE_O_READ);
                 if (RT_SUCCESS(vrc))
                     RTFileClose (file);
@@ -3039 +3004 @@
             if (RT_SUCCESS(vrc))
             {
-                vrc = VDGetFormat (locationFull, &backendName);
+                vrc = VDGetFormat(locationFull.c_str(), &backendName);
             }
             else if (vrc != VERR_FILE_NOT_FOUND && vrc != VERR_PATH_NOT_FOUND)
@@ -3045 +3010 @@
                 /* assume it's not a file, restore the original location */
                 location = locationFull = aLocation;
-                vrc = VDGetFormat (locationFull, &backendName);
+                vrc = VDGetFormat(locationFull.c_str(), &backendName);
             }
 
@@ -3113 +3078 @@
     /* get the format object first */
     {
-        AutoReadLock propsLock (mVirtualBox->systemProperties());
+        AutoReadLock propsLock(mVirtualBox->systemProperties());
 
         unconst(mm.formatObj)
@@ -3253 +3218 @@
              * images can be opened as base images. Should be fixed ASAP. */
             vrc = VDOpen(hdd,
-                         Utf8Str(mm.format),
-                         location,
+                         Utf8Str(mm.format).c_str(),
+                         location.c_str(),
                          flags,
                          mm.vdDiskIfaces);
@@ -3304 +3269 @@
                     {
                         lastAccessError = Utf8StrFmt (
-                            tr ("UUID {%RTuuid} of the hard disk '%ls' does not match the value {%RTuuid} stored in the media registry ('%ls')"),
+                            tr ("UUID {%RTuuid} of the hard disk '%ls' does not match the value {%RTuuid} stored in the media registry ('%s')"),
                             &uuid, m.locationFull.raw(), m.id.raw(),
-                            mVirtualBox->settingsFileName().raw());
+                            mVirtualBox->settingsFilePath().raw());
                         throw S_OK;
                     }
@@ -3354 +3319 @@
                     {
                         lastAccessError = Utf8StrFmt (
-                            tr ("Parent hard disk with UUID {%RTuuid} of the hard disk '%ls' is not found in the media registry ('%ls')"),
+                            tr ("Parent hard disk with UUID {%RTuuid} of the hard disk '%ls' is not found in the media registry ('%s')"),
                             &parentId, m.locationFull.raw(),
-                            mVirtualBox->settingsFileName().raw());
+                            mVirtualBox->settingsFilePath().raw());
                         throw S_OK;
                     }
@@ -3383 +3348 @@
                     {
                         lastAccessError = Utf8StrFmt (
-                            tr ("Hard disk '%ls' is differencing but it is not associated with any parent hard disk in the media registry ('%ls')"),
+                            tr ("Hard disk '%ls' is differencing but it is not associated with any parent hard disk in the media registry ('%s')"),
                             m.locationFull.raw(),
-                            mVirtualBox->settingsFileName().raw());
+                            mVirtualBox->settingsFilePath().raw());
                         throw S_OK;
                     }
@@ -3394 +3359 @@
                     {
                         lastAccessError = Utf8StrFmt (
-                            tr ("Parent UUID {%RTuuid} of the hard disk '%ls' does not match UUID {%RTuuid} of its parent hard disk stored in the media registry ('%ls')"),
+                            tr ("Parent UUID {%RTuuid} of the hard disk '%ls' does not match UUID {%RTuuid} of its parent hard disk stored in the media registry ('%s')"),
                             &parentId, m.locationFull.raw(),
                             mParent->id().raw(),
-                            mVirtualBox->settingsFileName().raw());
+                            mVirtualBox->settingsFilePath().raw());
                         throw S_OK;
                     }
@@ -3678 +3643 @@
 
 /* static */
-DECLCALLBACK(int) HardDisk::vdConfigQuery (void *pvUser, const char *pszName,
-                                            char *pszValue, size_t cchValue)
+DECLCALLBACK(int) HardDisk::vdConfigQuery(void *pvUser, const char *pszName,
+                                          char *pszValue, size_t cchValue)
 {
     AssertReturn(VALID_PTR (pszValue), VERR_INVALID_POINTER);
@@ -3699 +3664 @@
         return VERR_CFGM_VALUE_NOT_FOUND;
 
-    memcpy (pszValue, value, value.length() + 1);
+    memcpy(pszValue, value.c_str(), value.length() + 1);
 
     return VINF_SUCCESS;
@@ -3773 +3738 @@
                 {
                     /* ensure the directory exists */
-                    rc = VirtualBox::ensureFilePathExists (location);
+                    rc = VirtualBox::ensureFilePathExists(location.c_str());
                     CheckComRCThrowRC (rc);
 
@@ -3781 +3746 @@
                     that->mm.vdProgress = task->progress;
 
-                    vrc = VDCreateBase (hdd, format, location,
-                                        task->d.size * _1M,
-                                        task->d.variant,
-                                        NULL, &geo, &geo, id.raw(),
-                                        VD_OPEN_FLAGS_NORMAL,
-                                        NULL, that->mm.vdDiskIfaces);
+                    vrc = VDCreateBase(hdd,
+                                       format.c_str(),
+                                       location.c_str(),
+                                       task->d.size * _1M,
+                                       task->d.variant,
+                                       NULL,
+                                       &geo,
+                                       &geo,
+                                       id.raw(),
+                                       VD_OPEN_FLAGS_NORMAL,
+                                       NULL,
+                                       that->mm.vdDiskIfaces);
 
                     if (RT_FAILURE(vrc))
@@ -3883 +3854 @@
                 try
                 {
-                    vrc = VDOpen (hdd, format, location,
-                                  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                                  that->mm.vdDiskIfaces);
+                    vrc = VDOpen(hdd,
+                                 format.c_str(),
+                                 location.c_str(),
+                                 VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
+                                 that->mm.vdDiskIfaces);
                     if (RT_FAILURE(vrc))
                     {
-                        throw setError (E_FAIL,
-                            tr ("Could not open the hard disk storage unit '%s'%s"),
-                            location.raw(), that->vdError (vrc).raw());
+                        throw setError(E_FAIL,
+                                       tr("Could not open the hard disk storage unit '%s'%s"),
+                                       location.raw(), that->vdError (vrc).raw());
                     }
 
@@ -3902 +3875 @@
                     /** @todo add VD_IMAGE_FLAGS_DIFF to the image flags, to
                      * be on the safe side. */
-                    vrc = VDCreateDiff (hdd, targetFormat, targetLocation,
-                                        task->d.variant,
-                                        NULL, targetId.raw(),
-                                        id.raw(),
-                                        VD_OPEN_FLAGS_NORMAL,
-                                        target->mm.vdDiskIfaces,
-                                        that->mm.vdDiskIfaces);
+                    vrc = VDCreateDiff(hdd,
+                                       targetFormat.c_str(),
+                                       targetLocation.c_str(),
+                                       task->d.variant,
+                                       NULL,
+                                       targetId.raw(),
+                                       id.raw(),
+                                       VD_OPEN_FLAGS_NORMAL,
+                                       target->mm.vdDiskIfaces,
+                                       that->mm.vdDiskIfaces);
 
                     that->mm.vdProgress = NULL;
@@ -4057 +4033 @@
                         /* open the first image with VDOPEN_FLAGS_INFO because
                          * it's not necessarily the base one */
-                        vrc = VDOpen (hdd, Utf8Str ((*it)->mm.format),
-                                      Utf8Str ((*it)->m.locationFull),
-                                      it == chain->begin() ?
+                        vrc = VDOpen(hdd,
+                                     Utf8Str((*it)->mm.format).c_str(),
+                                     Utf8Str((*it)->m.locationFull).c_str(),
+                                     it == chain->begin() ?
                                           VD_OPEN_FLAGS_INFO : 0,
-                                      (*it)->mm.vdDiskIfaces);
+                                     (*it)->mm.vdDiskIfaces);
                         if (RT_FAILURE(vrc))
                             throw vrc;
@@ -4109 +4086 @@
                             {
                                 /* VD_OPEN_FLAGS_INFO since UUID is wrong yet */
-                                vrc = VDOpen (hdd, Utf8Str ((*it)->mm.format),
-                                              Utf8Str ((*it)->m.locationFull),
-                                              VD_OPEN_FLAGS_INFO,
-                                              (*it)->mm.vdDiskIfaces);
+                                vrc = VDOpen(hdd,
+                                             Utf8Str((*it)->mm.format).c_str(),
+                                             Utf8Str((*it)->m.locationFull).c_str(),
+                                             VD_OPEN_FLAGS_INFO,
+                                             (*it)->mm.vdDiskIfaces);
                                 if (RT_FAILURE(vrc))
                                     throw vrc;
@@ -4349 +4327 @@
 
                         /** Open all images in read-only mode. */
-                        vrc = VDOpen (hdd, Utf8Str ((*it)->mm.format),
-                                      Utf8Str ((*it)->m.locationFull),
-                                      VD_OPEN_FLAGS_READONLY,
-                                      (*it)->mm.vdDiskIfaces);
+                        vrc = VDOpen(hdd,
+                                     Utf8Str((*it)->mm.format).c_str(),
+                                     Utf8Str((*it)->m.locationFull).c_str(),
+                                     VD_OPEN_FLAGS_READONLY,
+                                     (*it)->mm.vdDiskIfaces);
                         if (RT_FAILURE(vrc))
                         {
@@ -4395 +4374 @@
 
                             /* Open all images in appropriate mode. */
-                            vrc = VDOpen (targetHdd, Utf8Str ((*it)->mm.format),
-                                          Utf8Str ((*it)->m.locationFull),
-                                          ((*it)->m.state == MediaState_LockedWrite) ? VD_OPEN_FLAGS_NORMAL : VD_OPEN_FLAGS_READONLY,
-                                          (*it)->mm.vdDiskIfaces);
+                            vrc = VDOpen(targetHdd,
+                                         Utf8Str((*it)->mm.format).c_str(),
+                                         Utf8Str((*it)->m.locationFull).c_str(),
+                                         ((*it)->m.state == MediaState_LockedWrite) ? VD_OPEN_FLAGS_NORMAL : VD_OPEN_FLAGS_READONLY,
+                                         (*it)->mm.vdDiskIfaces);
                             if (RT_FAILURE(vrc))
                             {
@@ -4408 +4388 @@
                         }
 
-                        vrc = VDCopy (hdd, VD_LAST_IMAGE, targetHdd,
-                                      targetFormat,
-                                      target->m.state == MediaState_Creating ? targetLocation.raw() : (char *)NULL,
-                                      false, 0,
-                                      task->d.variant, targetId.raw(), NULL,
-                                      target->mm.vdDiskIfaces,
-                                      that->mm.vdDiskIfaces);
+                        vrc = VDCopy(hdd,
+                                     VD_LAST_IMAGE,
+                                     targetHdd,
+                                     targetFormat.c_str(),
+                                     target->m.state == MediaState_Creating ? targetLocation.raw() : (char *)NULL,
+                                     false, 0,
+                                     task->d.variant, targetId.raw(), NULL,
+                                     target->mm.vdDiskIfaces,
+                                     that->mm.vdDiskIfaces);
 
                         that->mm.vdProgress = NULL;
@@ -4533 +4515 @@
                 try
                 {
-                    vrc = VDOpen (hdd, format, location,
-                                  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                                  that->mm.vdDiskIfaces);
+                    vrc = VDOpen(hdd,
+                                 format.c_str(),
+                                 location.c_str(),
+                                 VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
+                                 that->mm.vdDiskIfaces);
                     if (RT_SUCCESS(vrc))
                         vrc = VDClose (hdd, true /* fDelete */);
@@ -4601 +4585 @@
                 {
                     /* first, delete the storage unit */
-                    vrc = VDOpen (hdd, format, location,
-                                  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                                  that->mm.vdDiskIfaces);
+                    vrc = VDOpen(hdd,
+                                 format.c_str(),
+                                 location.c_str(),
+                                 VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
+                                 that->mm.vdDiskIfaces);
                     if (RT_SUCCESS(vrc))
                         vrc = VDClose (hdd, true /* fDelete */);
@@ -4615 +4601 @@
 
                     /* next, create it again */
-                    vrc = VDOpen (hdd, parentFormat, parentLocation,
-                                  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                                  that->mm.vdDiskIfaces);
+                    vrc = VDOpen(hdd,
+                                 parentFormat.c_str(),
+                                 parentLocation.c_str(),
+                                 VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
+                                 that->mm.vdDiskIfaces);
                     if (RT_FAILURE(vrc))
                     {
@@ -4628 +4616 @@
                     that->mm.vdProgress = task->progress;
 
-                    vrc = VDCreateDiff (hdd, format, location,
-                                        /// @todo use the same image variant as before
-                                        VD_IMAGE_FLAGS_NONE,
-                                        NULL, id.raw(),
-                                        parentId.raw(),
-                                        VD_OPEN_FLAGS_NORMAL,
-                                        that->mm.vdDiskIfaces,
-                                        that->mm.vdDiskIfaces);
+                    vrc = VDCreateDiff(hdd,
+                                       format.c_str(),
+                                       location.c_str(),
+                                       /// @todo use the same image variant as before
+                                       VD_IMAGE_FLAGS_NONE,
+                                       NULL,
+                                       id.raw(),
+                                       parentId.raw(),
+                                       VD_OPEN_FLAGS_NORMAL,
+                                       that->mm.vdDiskIfaces,
+                                       that->mm.vdDiskIfaces);
 
                     that->mm.vdProgress = NULL;
@@ -4705 +4696 @@
 
                         /** Open all images but last in read-only mode. */
-                        vrc = VDOpen (hdd, Utf8Str ((*it)->mm.format),
-                                      Utf8Str ((*it)->m.locationFull),
-                                      (it == last) ? VD_OPEN_FLAGS_NORMAL : VD_OPEN_FLAGS_READONLY,
-                                      (*it)->mm.vdDiskIfaces);
+                        vrc = VDOpen(hdd,
+                                     Utf8Str((*it)->mm.format).c_str(),
+                                     Utf8Str((*it)->m.locationFull).c_str(),
+                                     (it == last) ? VD_OPEN_FLAGS_NORMAL : VD_OPEN_FLAGS_READONLY,
+                                     (*it)->mm.vdDiskIfaces);
                         if (RT_FAILURE(vrc))
                         {

trunk/src/VBox/Main/HostImpl.cpp

@@ -1345 +1345 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-HRESULT Host::loadSettings (const settings::Key &aGlobal)
-{
-    using namespace settings;
-
+HRESULT Host::loadSettings(const settings::Host &data)
+{
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -1354 +1352 @@
     AutoWriteLock alock(this);
 
-    AssertReturn(!aGlobal.isNull(), E_FAIL);
-
     HRESULT rc = S_OK;
 
 #ifdef VBOX_WITH_USB
-    Key::List filters = aGlobal.key ("USBDeviceFilters").keys ("DeviceFilter");
-    for (Key::List::const_iterator it = filters.begin();
-         it != filters.end(); ++ it)
-    {
-        Bstr name = (*it).stringValue ("name");
-        bool active = (*it).value <bool> ("active");
-
-        Bstr vendorId = (*it).stringValue ("vendorId");
-        Bstr productId = (*it).stringValue ("productId");
-        Bstr revision = (*it).stringValue ("revision");
-        Bstr manufacturer = (*it).stringValue ("manufacturer");
-        Bstr product = (*it).stringValue ("product");
-        Bstr serialNumber = (*it).stringValue ("serialNumber");
-        Bstr port = (*it).stringValue ("port");
-
-        USBDeviceFilterAction_T action;
-        action = USBDeviceFilterAction_Ignore;
-        const char *actionStr = (*it).stringValue ("action");
-        if (strcmp (actionStr, "Ignore") == 0)
-            action = USBDeviceFilterAction_Ignore;
-        else
-        if (strcmp (actionStr, "Hold") == 0)
-            action = USBDeviceFilterAction_Hold;
-        else
-            AssertMsgFailed (("Invalid action: '%s'\n", actionStr));
-
-        ComObjPtr<HostUSBDeviceFilter> filterObj;
-        filterObj.createObject();
-        rc = filterObj->init (this,
-                              name, active, vendorId, productId, revision,
-                              manufacturer, product, serialNumber, port,
-                              action);
-        /* error info is set by init() when appropriate */
+    for (settings::USBDeviceFiltersList::const_iterator it = data.llUSBDeviceFilters.begin();
+         it != data.llUSBDeviceFilters.end();
+         ++it)
+    {
+        const settings::USBDeviceFilter &f = *it;
+        ComObjPtr<HostUSBDeviceFilter> pFilter;
+        pFilter.createObject();
+        rc = pFilter->init(this, f);
         CheckComRCBreakRC (rc);
 
-        mUSBDeviceFilters.push_back (filterObj);
-        filterObj->mInList = true;
+        mUSBDeviceFilters.push_back(pFilter);
+        pFilter->mInList = true;
 
         /* notify the proxy (only when the filter is active) */
-        if (filterObj->data().mActive)
-        {
-            HostUSBDeviceFilter *flt = filterObj; /* resolve ambiguity */
-            flt->id() = mUSBProxyService->insertFilter (&filterObj->data().mUSBFilter);
+        if (pFilter->data().mActive)
+        {
+            HostUSBDeviceFilter *flt = pFilter; /* resolve ambiguity */
+            flt->id() = mUSBProxyService->insertFilter(&pFilter->data().mUSBFilter);
         }
     }
@@ -1409 +1380 @@
 }
 
-HRESULT Host::saveSettings (settings::Key &aGlobal)
-{
-    using namespace settings;
-
+HRESULT Host::saveSettings(settings::Host &data)
+{
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -1418 +1387 @@
     AutoWriteLock alock(this);
 
-    ComAssertRet (!aGlobal.isNull(), E_FAIL);
-
 #ifdef VBOX_WITH_USB
-    /* first, delete the entry */
-    Key filters = aGlobal.findKey ("USBDeviceFilters");
-    if (!filters.isNull())
-        filters.zap();
-    /* then, recreate it */
-    filters = aGlobal.createKey ("USBDeviceFilters");
-
-    USBDeviceFilterList::const_iterator it = mUSBDeviceFilters.begin();
-    while (it != mUSBDeviceFilters.end())
-    {
-        AutoWriteLock filterLock (*it);
-        const HostUSBDeviceFilter::Data &data = (*it)->data();
-
-        Key filter = filters.appendKey ("DeviceFilter");
-
-        filter.setValue <Bstr> ("name", data.mName);
-        filter.setValue <bool> ("active", !!data.mActive);
-
-        /* all are optional */
-        Bstr str;
-        (*it)->COMGETTER (VendorId) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("vendorId", str);
-
-        (*it)->COMGETTER (ProductId) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("productId", str);
-
-        (*it)->COMGETTER (Revision) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("revision", str);
-
-        (*it)->COMGETTER (Manufacturer) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("manufacturer", str);
-
-        (*it)->COMGETTER (Product) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("product", str);
-
-        (*it)->COMGETTER (SerialNumber) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("serialNumber", str);
-
-        (*it)->COMGETTER (Port) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("port", str);
-
-        /* action is mandatory */
-        USBDeviceFilterAction_T action = USBDeviceFilterAction_Null;
-        (*it)->COMGETTER (Action) (&action);
-        if (action == USBDeviceFilterAction_Ignore)
-            filter.setStringValue ("action", "Ignore");
-        else if (action == USBDeviceFilterAction_Hold)
-            filter.setStringValue ("action", "Hold");
-        else
-            AssertMsgFailed (("Invalid action: %d\n", action));
-
-        ++ it;
+    data.llUSBDeviceFilters.clear();
+
+    for (USBDeviceFilterList::const_iterator it = mUSBDeviceFilters.begin();
+         it != mUSBDeviceFilters.end();
+         ++it)
+    {
+        ComObjPtr<HostUSBDeviceFilter> pFilter = *it;
+        settings::USBDeviceFilter f;
+        pFilter->saveSettings(f);
+        data.llUSBDeviceFilters.push_back(f);
     }
 #endif /* VBOX_WITH_USB */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -43 +43 @@
 #include "USBControllerImpl.h"
 #include "HostImpl.h"
-#include "SystemPropertiesImpl.h"
 #include "SharedFolderImpl.h"
 #include "GuestOSTypeImpl.h"
@@ -96 +95 @@
 // globals
 /////////////////////////////////////////////////////////////////////////////
-
-/**
- *  @note The template is NOT completely valid according to VBOX_XML_SCHEMA
- *  (when loading a newly created settings file, validation will be turned off)
- */
-static const char gDefaultMachineConfig[] =
-{
-    "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" RTFILE_LINEFEED
-    "<!-- Sun VirtualBox Machine Configuration -->" RTFILE_LINEFEED
-    "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" "
-        "version=\"" VBOX_XML_VERSION_FULL "\">" RTFILE_LINEFEED
-    "</VirtualBox>" RTFILE_LINEFEED
-};
 
 /**
@@ -258 +244 @@
         while (thatIt != thatFolders.end())
         {
-            if ((*it)->name() == (*thatIt)->name() &&
-                RTPathCompare (Utf8Str ((*it)->hostPath()),
-                               Utf8Str ((*thatIt)->hostPath())) == 0)
+            if (    (*it)->name() == (*thatIt)->name()
+                 && RTPathCompare(Utf8Str((*it)->hostPath()).c_str(),
+                                  Utf8Str((*thatIt)->hostPath()).c_str()
+                                 ) == 0)
             {
                 thatFolders.erase (thatIt);
@@ -383 +370 @@
  *  @return  Success indicator. if not S_OK, the machine object is invalid
  */
-HRESULT Machine::init (VirtualBox *aParent, CBSTR aConfigFile,
-                       InitMode aMode, CBSTR aName /* = NULL */,
-                       GuestOSType *aOsType /* = NULL */,
-                       BOOL aNameSync /* = TRUE */,
-                       const Guid *aId /* = NULL */)
+HRESULT Machine::init(VirtualBox *aParent,
+                      const Utf8Str &strConfigFile,
+                      InitMode aMode,
+                      CBSTR aName /* = NULL */,
+                      GuestOSType *aOsType /* = NULL */,
+                      BOOL aNameSync /* = TRUE */,
+                      const Guid *aId /* = NULL */)
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aConfigFile='%ls', aMode=%d\n", aConfigFile, aMode));
-
-    AssertReturn(aParent, E_INVALIDARG);
-    AssertReturn(aConfigFile, E_INVALIDARG);
+    LogFlowThisFunc (("aConfigFile='%s', aMode=%d\n", strConfigFile.raw(), aMode));
+
+    AssertReturn (aParent, E_INVALIDARG);
+    AssertReturn (!strConfigFile.isEmpty(), E_INVALIDARG);
     AssertReturn(aMode != Init_New || (aName != NULL && *aName != '\0'),
                   E_INVALIDARG);
@@ -415 +404 @@
     mData.allocate();
 
+    mData->m_pMachineConfigFile = NULL;
+
     /* memorize the config file name (as provided) */
-    mData->mConfigFile = aConfigFile;
+    mData->m_strConfigFile = strConfigFile;
 
     /* get the full file name */
-    Utf8Str configFileFull;
-    int vrc = mParent->calculateFullPath (Utf8Str (aConfigFile), configFileFull);
+    int vrc = mParent->calculateFullPath(strConfigFile, mData->m_strConfigFileFull);
     if (RT_FAILURE(vrc))
-        return setError (VBOX_E_FILE_ERROR,
-            tr ("Invalid machine settings file name '%ls' (%Rrc)"),
-            aConfigFile, vrc);
-
-    mData->mConfigFileFull = configFileFull;
+        return setError(VBOX_E_FILE_ERROR,
+                        tr("Invalid machine settings file name '%s' (%Rrc)"),
+                        strConfigFile.raw(),
+                        vrc);
 
     if (aMode == Init_Registered)
@@ -435 +424 @@
          * in loadSettings() */
         unconst(mData->mUuid) = *aId;
+
+        // now load the settings from XML:
         rc = registeredInit();
     }
     else
     {
-        if (aMode == Init_Existing)
-        {
-            /* lock the settings file */
-            rc = lockConfig();
+        if (aMode == Init_Import)
+        {
+            // we're reading the settings file below
         }
         else if (aMode == Init_New)
@@ -448 +438 @@
             /* check for the file existence */
             RTFILE f = NIL_RTFILE;
-            int vrc = RTFileOpen (&f, configFileFull, RTFILE_O_READ);
-            if (RT_SUCCESS(vrc) || vrc == VERR_SHARING_VIOLATION)
+            int vrc = RTFileOpen(&f, mData->m_strConfigFileFull.c_str(), RTFILE_O_READ);
+            if (    RT_SUCCESS(vrc)
+                 || vrc == VERR_SHARING_VIOLATION
+               )
             {
-                rc = setError (VBOX_E_FILE_ERROR,
-                    tr ("Machine settings file '%s' already exists"),
-                    configFileFull.raw());
+                rc = setError(VBOX_E_FILE_ERROR,
+                              tr("Machine settings file '%s' already exists"),
+                              mData->m_strConfigFileFull.raw());
                 if (RT_SUCCESS(vrc))
-                    RTFileClose (f);
+                    RTFileClose(f);
             }
             else
             {
-                if (vrc != VERR_FILE_NOT_FOUND && vrc != VERR_PATH_NOT_FOUND)
-                    rc = setError (VBOX_E_FILE_ERROR,
-                        tr ("Invalid machine settings file name '%ls' (%Rrc)"),
-                        mData->mConfigFileFull.raw(), vrc);
+                if (     vrc != VERR_FILE_NOT_FOUND
+                      && vrc != VERR_PATH_NOT_FOUND
+                   )
+                    rc = setError(VBOX_E_FILE_ERROR,
+                                  tr("Invalid machine settings file name '%s' (%Rrc)"),
+                                  mData->m_strConfigFileFull.raw(),
+                                  vrc);
             }
+
+            // create an empty machine config
+            mData->m_pMachineConfigFile = new settings::MachineConfigFile(NULL);
         }
         else
@@ -479 +477 @@
             if (aMode != Init_New)
             {
-                rc = loadSettings (false /* aRegistered */);
+                rc = loadSettings(false /* aRegistered */);
             }
             else
@@ -495 +493 @@
                 /* initialize the default snapshots folder
                  * (note: depends on the name value set above!) */
-                rc = COMSETTER(SnapshotFolder) (NULL);
-                AssertComRC (rc);
+                rc = COMSETTER(SnapshotFolder)(NULL);
+                AssertComRC(rc);
 
                 if (aOsType)
@@ -571 +569 @@
     AssertReturn(!mData->mAccessible, E_FAIL);
 
-    HRESULT rc = lockConfig();
-
-    if (SUCCEEDED(rc))
-        rc = initDataAndChildObjects();
+    HRESULT rc = initDataAndChildObjects();
 
     if (SUCCEEDED(rc))
@@ -584 +579 @@
         mData->mRegistered = FALSE;
 
-        rc = loadSettings (true /* aRegistered */);
+        rc = loadSettings(true /* aRegistered */);
 
         /* Restore the registered flag (even on failure) */
         mData->mRegistered = TRUE;
-
-        if (FAILED (rc))
-            unlockConfig();
     }
 
@@ -610 +602 @@
         /* fetch the current error info */
         mData->mAccessError = com::ErrorInfo();
-        LogWarning (("Machine {%RTuuid} is inaccessible! [%ls]\n",
-                     mData->mUuid.raw(),
-                     mData->mAccessError.getText().raw()));
+        LogWarning(("Machine {%RTuuid} is inaccessible! [%ls]\n",
+                    mData->mUuid.raw(),
+                    mData->mAccessError.getText().raw()));
 
         /* rollback all changes */
@@ -701 +693 @@
     alock.leave();
 
-    /* make sure the configuration is unlocked */
-    unlockConfig();
-
     if (isModified())
     {
@@ -721 +710 @@
 }
 
+/**
+ * Helper to initialize all associated child objects and allocate data
+ * structures.
+ *
+ * This method must be called as a part of the object's initialization procedure
+ * (usually done in the #init() method).
+ *
+ * @note Must be called only from #init() or from #registeredInit().
+ */
+HRESULT Machine::initDataAndChildObjects()
+{
+    AutoCaller autoCaller (this);
+    AssertComRCReturnRC (autoCaller.rc());
+    AssertComRCReturn (autoCaller.state() == InInit ||
+                       autoCaller.state() == Limited, E_FAIL);
+
+    AssertReturn (!mData->mAccessible, E_FAIL);
+
+    /* allocate data structures */
+    mSSData.allocate();
+    mUserData.allocate();
+    mHWData.allocate();
+    mHDData.allocate();
+    mStorageControllers.allocate();
+
+    /* initialize mOSTypeId */
+    mUserData->mOSTypeId = mParent->getUnknownOSType()->id();
+
+    /* create associated BIOS settings object */
+    unconst (mBIOSSettings).createObject();
+    mBIOSSettings->init (this);
+
+#ifdef VBOX_WITH_VRDP
+    /* create an associated VRDPServer object (default is disabled) */
+    unconst (mVRDPServer).createObject();
+    mVRDPServer->init (this);
+#endif
+
+    /* create an associated DVD drive object */
+    unconst (mDVDDrive).createObject();
+    mDVDDrive->init (this);
+
+    /* create an associated floppy drive object */
+    unconst (mFloppyDrive).createObject();
+    mFloppyDrive->init (this);
+
+    /* create associated serial port objects */
+    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
+    {
+        unconst (mSerialPorts [slot]).createObject();
+        mSerialPorts [slot]->init (this, slot);
+    }
+
+    /* create associated parallel port objects */
+    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
+    {
+        unconst (mParallelPorts [slot]).createObject();
+        mParallelPorts [slot]->init (this, slot);
+    }
+
+    /* create the audio adapter object (always present, default is disabled) */
+    unconst (mAudioAdapter).createObject();
+    mAudioAdapter->init (this);
+
+    /* create the USB controller object (always present, default is disabled) */
+    unconst (mUSBController).createObject();
+    mUSBController->init (this);
+
+    /* create associated network adapter objects */
+    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++)
+    {
+        unconst (mNetworkAdapters [slot]).createObject();
+        mNetworkAdapters [slot]->init (this, slot);
+    }
+
+    return S_OK;
+}
+
+/**
+ * Helper to uninitialize all associated child objects and to free all data
+ * structures.
+ *
+ * This method must be called as a part of the object's uninitialization
+ * procedure (usually done in the #uninit() method).
+ *
+ * @note Must be called only from #uninit() or from #registeredInit().
+ */
+void Machine::uninitDataAndChildObjects()
+{
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid (autoCaller.state() == InUninit ||
+                           autoCaller.state() == Limited);
+
+    /* uninit all children using addDependentChild()/removeDependentChild()
+     * in their init()/uninit() methods */
+    uninitDependentChildren();
+
+    /* tell all our other child objects we've been uninitialized */
+
+    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++)
+    {
+        if (mNetworkAdapters [slot])
+        {
+            mNetworkAdapters [slot]->uninit();
+            unconst (mNetworkAdapters [slot]).setNull();
+        }
+    }
+
+    if (mUSBController)
+    {
+        mUSBController->uninit();
+        unconst (mUSBController).setNull();
+    }
+
+    if (mAudioAdapter)
+    {
+        mAudioAdapter->uninit();
+        unconst (mAudioAdapter).setNull();
+    }
+
+    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
+    {
+        if (mParallelPorts [slot])
+        {
+            mParallelPorts [slot]->uninit();
+            unconst (mParallelPorts [slot]).setNull();
+        }
+    }
+
+    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
+    {
+        if (mSerialPorts [slot])
+        {
+            mSerialPorts [slot]->uninit();
+            unconst (mSerialPorts [slot]).setNull();
+        }
+    }
+
+    if (mFloppyDrive)
+    {
+        mFloppyDrive->uninit();
+        unconst (mFloppyDrive).setNull();
+    }
+
+    if (mDVDDrive)
+    {
+        mDVDDrive->uninit();
+        unconst (mDVDDrive).setNull();
+    }
+
+#ifdef VBOX_WITH_VRDP
+    if (mVRDPServer)
+    {
+        mVRDPServer->uninit();
+        unconst (mVRDPServer).setNull();
+    }
+#endif
+
+    if (mBIOSSettings)
+    {
+        mBIOSSettings->uninit();
+        unconst (mBIOSSettings).setNull();
+    }
+
+    /* Deassociate hard disks (only when a real Machine or a SnapshotMachine
+     * instance is uninitialized; SessionMachine instances refer to real
+     * Machine hard disks). This is necessary for a clean re-initialization of
+     * the VM after successfully re-checking the accessibility state. Note
+     * that in case of normal Machine or SnapshotMachine uninitialization (as
+     * a result of unregistering or discarding the snapshot), outdated hard
+     * disk attachments will already be uninitialized and deleted, so this
+     * code will not affect them. */
+    if (!!mHDData && (mType == IsMachine || mType == IsSnapshotMachine))
+    {
+        for (HDData::AttachmentList::const_iterator it =
+                 mHDData->mAttachments.begin();
+             it != mHDData->mAttachments.end();
+             ++ it)
+        {
+            HRESULT rc = (*it)->hardDisk()->detachFrom (mData->mUuid,
+                                                        snapshotId());
+            AssertComRC(rc);
+        }
+    }
+
+    if (mType == IsMachine)
+    {
+        /* reset some important fields of mData */
+        mData->mCurrentSnapshot.setNull();
+        mData->mFirstSnapshot.setNull();
+    }
+
+    /* free data structures (the essential mData structure is not freed here
+     * since it may be still in use) */
+    mHDData.free();
+    mStorageControllers.free();
+    mHWData.free();
+    mUserData.free();
+    mSSData.free();
+}
+
 // IMachine properties
 /////////////////////////////////////////////////////////////////////////////
@@ -754 +945 @@
         AutoReinitSpan autoReinitSpan(this);
         AssertReturn(autoReinitSpan.isOk(), E_FAIL);
+
+        if (mData->m_pMachineConfigFile)
+        {
+            // @todo why are we parsing this several times?
+            // this is hugely inefficient
+            delete mData->m_pMachineConfigFile;
+            mData->m_pMachineConfigFile = NULL;
+        }
 
         rc = registeredInit();
@@ -825 +1024 @@
 
     if (!*aName)
-        return setError (E_INVALIDARG,
-            tr ("Machine name cannot be empty"));
+        return setError(E_INVALIDARG,
+                        tr("Machine name cannot be empty"));
 
     AutoCaller autoCaller(this);
@@ -951 +1150 @@
     if (    hwVersion.compare ("1") != 0
         &&  hwVersion.compare ("2") != 0)
-        return setError (E_INVALIDARG,
-            tr ("Invalid hardware version: %ls\n"), aHWVersion);
+        return setError(E_INVALIDARG,
+                        tr("Invalid hardware version: %ls\n"), aHWVersion);
 
     AutoCaller autoCaller(this);
@@ -986 +1185 @@
 {
     /* check RAM limits */
-    if (memorySize < MM_RAM_MIN_IN_MB ||
-        memorySize > MM_RAM_MAX_IN_MB)
-        return setError (E_INVALIDARG,
-            tr ("Invalid RAM size: %lu MB (must be in range [%lu, %lu] MB)"),
-                memorySize, MM_RAM_MIN_IN_MB, MM_RAM_MAX_IN_MB);
+    if (    memorySize < MM_RAM_MIN_IN_MB
+         || memorySize > MM_RAM_MAX_IN_MB
+       )
+        return setError(E_INVALIDARG,
+                        tr("Invalid RAM size: %lu MB (must be in range [%lu, %lu] MB)"),
+                        memorySize, MM_RAM_MIN_IN_MB, MM_RAM_MAX_IN_MB);
 
     AutoCaller autoCaller(this);
@@ -1024 +1224 @@
 {
     /* check RAM limits */
-    if (CPUCount < SchemaDefs::MinCPUCount ||
-        CPUCount > SchemaDefs::MaxCPUCount)
-        return setError (E_INVALIDARG,
-            tr ("Invalid virtual CPU count: %lu (must be in range [%lu, %lu])"),
-                CPUCount, SchemaDefs::MinCPUCount, SchemaDefs::MaxCPUCount);
+    if (    CPUCount < SchemaDefs::MinCPUCount
+         || CPUCount > SchemaDefs::MaxCPUCount
+       )
+        return setError(E_INVALIDARG,
+                        tr("Invalid virtual CPU count: %lu (must be in range [%lu, %lu])"),
+                        CPUCount, SchemaDefs::MinCPUCount, SchemaDefs::MaxCPUCount);
 
     AutoCaller autoCaller(this);
@@ -1064 +1265 @@
     if (memorySize < SchemaDefs::MinGuestVRAM ||
         memorySize > SchemaDefs::MaxGuestVRAM)
-        return setError (E_INVALIDARG,
-            tr ("Invalid VRAM size: %lu MB (must be in range [%lu, %lu] MB)"),
-                memorySize, SchemaDefs::MinGuestVRAM, SchemaDefs::MaxGuestVRAM);
+        return setError(E_INVALIDARG,
+                        tr("Invalid VRAM size: %lu MB (must be in range [%lu, %lu] MB)"),
+                        memorySize, SchemaDefs::MinGuestVRAM, SchemaDefs::MaxGuestVRAM);
 
     AutoCaller autoCaller(this);
@@ -1103 +1304 @@
     /* check limits */
     if (memoryBalloonSize >= VMMDEV_MAX_MEMORY_BALLOON (mHWData->mMemorySize))
-        return setError (E_INVALIDARG,
-            tr ("Invalid memory balloon size: %lu MB (must be in range [%lu, %lu] MB)"),
-                memoryBalloonSize, 0, VMMDEV_MAX_MEMORY_BALLOON (mHWData->mMemorySize));
+        return setError(E_INVALIDARG,
+                        tr("Invalid memory balloon size: %lu MB (must be in range [%lu, %lu] MB)"),
+                        memoryBalloonSize, 0, VMMDEV_MAX_MEMORY_BALLOON (mHWData->mMemorySize));
 
     AutoCaller autoCaller(this);
@@ -1241 +1442 @@
     /* make sure monitor count is a sensible number */
     if (monitorCount < 1 || monitorCount > SchemaDefs::MaxGuestMonitors)
-        return setError (E_INVALIDARG,
-            tr ("Invalid monitor count: %lu (must be in range [%lu, %lu])"),
-                monitorCount, 1, SchemaDefs::MaxGuestMonitors);
+        return setError(E_INVALIDARG,
+                        tr("Invalid monitor count: %lu (must be in range [%lu, %lu])"),
+                        monitorCount, 1, SchemaDefs::MaxGuestMonitors);
 
     AutoCaller autoCaller(this);
@@ -1438 +1639 @@
 
     if (!mData->mCurrentSnapshot.isNull())
-        return setError (E_FAIL,
-            tr ("The snapshot folder of a machine with snapshots cannot "
-                "be changed (please discard all snapshots first)"));
+        return setError(E_FAIL,
+                        tr("The snapshot folder of a machine with snapshots cannot be changed (please discard all snapshots first)"));
 
     Utf8Str snapshotFolder = aSnapshotFolder;
@@ -1459 +1659 @@
     }
 
-    int vrc = calculateFullPath (snapshotFolder, snapshotFolder);
+    int vrc = calculateFullPath(snapshotFolder, snapshotFolder);
     if (RT_FAILURE(vrc))
-        return setError (E_FAIL,
-            tr ("Invalid snapshot folder '%ls' (%Rrc)"),
-                aSnapshotFolder, vrc);
+        return setError(E_FAIL,
+                        tr("Invalid snapshot folder '%ls' (%Rrc)"),
+                        aSnapshotFolder, vrc);
 
     mUserData.backup();
@@ -1586 +1786 @@
     AutoReadLock alock(this);
 
-    mData->mConfigFileFull.cloneTo(aFilePath);
-    return S_OK;
-}
-
-STDMETHODIMP Machine::
-COMGETTER(SettingsFileVersion) (BSTR *aSettingsFileVersion)
-{
-    CheckComArgOutPointerValid(aSettingsFileVersion);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this);
-
-    mData->mSettingsFileVersion.cloneTo(aSettingsFileVersion);
+    mData->m_strConfigFileFull.cloneTo(aFilePath);
     return S_OK;
 }
@@ -1616 +1802 @@
     CheckComRCReturnRC(rc);
 
-    if (!isConfigLocked())
-    {
-        /*
-         *  if we're ready and isConfigLocked() is FALSE then it means
-         *  that no config file exists yet, so always return TRUE
-         */
+    if (mData->mInitMode == Init_New)
+          /*
+           *  if this is a new machine then no config file exists yet, so always return TRUE
+           */
         *aModified = TRUE;
-    }
     else
-    {
         *aModified = isModified();
-    }
 
     return S_OK;
@@ -1789 +1970 @@
 }
 
-STDMETHODIMP
-Machine::COMGETTER(SharedFolders) (ComSafeArrayOut(ISharedFolder *, aSharedFolders))
+STDMETHODIMP Machine::COMGETTER(SharedFolders) (ComSafeArrayOut(ISharedFolder *, aSharedFolders))
 {
     CheckComArgOutSafeArrayPointerValid(aSharedFolders);
@@ -1805 +1985 @@
 }
 
-STDMETHODIMP
-Machine::COMGETTER(ClipboardMode) (ClipboardMode_T *aClipboardMode)
+STDMETHODIMP Machine::COMGETTER(ClipboardMode) (ClipboardMode_T *aClipboardMode)
 {
     CheckComArgOutPointerValid(aClipboardMode);
@@ -1893 +2072 @@
 {
     if (aPosition < 1 || aPosition > SchemaDefs::MaxBootPosition)
-        return setError (E_INVALIDARG,
-            tr ("Invalid boot position: %lu (must be in range [1, %lu])"),
-                aPosition, SchemaDefs::MaxBootPosition);
+        return setError(E_INVALIDARG,
+                        tr ("Invalid boot position: %lu (must be in range [1, %lu])"),
+                        aPosition, SchemaDefs::MaxBootPosition);
 
     if (aDevice == DeviceType_USB)
-        return setError (E_NOTIMPL,
-            tr ("Booting from USB device is currently not supported"));
+        return setError(E_NOTIMPL,
+                        tr("Booting from USB device is currently not supported"));
 
     AutoCaller autoCaller(this);
@@ -1918 +2097 @@
 {
     if (aPosition < 1 || aPosition > SchemaDefs::MaxBootPosition)
-        return setError (E_INVALIDARG,
-            tr ("Invalid boot position: %lu (must be in range [1, %lu])"),
-                aPosition, SchemaDefs::MaxBootPosition);
+        return setError(E_INVALIDARG,
+                       tr("Invalid boot position: %lu (must be in range [1, %lu])"),
+                       aPosition, SchemaDefs::MaxBootPosition);
 
     AutoCaller autoCaller(this);
@@ -1936 +2115 @@
                                      LONG aDevice)
 {
-    LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld\n",
+    LogFlowThisFunc (("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld\n",
                      aControllerName, aControllerPort, aDevice));
 
@@ -1993 +2172 @@
         ComObjPtr<HardDisk> hd = (*it)->hardDisk();
         AutoReadLock hdLock (hd);
-        return setError (VBOX_E_OBJECT_IN_USE,
-            tr ("Hard disk '%ls' is already attached to device slot %d on "
-                "port %d of controller '%ls' of this virtual machine"),
-            hd->locationFull().raw(), aDevice, aControllerPort, aControllerName);
+        return setError(VBOX_E_OBJECT_IN_USE,
+                        tr ("Hard disk '%ls' is already attached to device slot %d on port %d of controller '%ls' of this virtual machine"),
+                        hd->locationFull().raw(), aDevice, aControllerPort, aControllerName);
     }
 
@@ -2016 +2194 @@
             mHDData->mAttachments.end())
     {
-        return setError (VBOX_E_OBJECT_IN_USE,
-            tr ("Hard disk '%ls' is already attached to this virtual machine"),
-            hd->locationFull().raw());
+        return setError(VBOX_E_OBJECT_IN_USE,
+                        tr("Hard disk '%ls' is already attached to this virtual machine"),
+                        hd->locationFull().raw());
     }
 
@@ -2316 +2494 @@
 
     if (it == mHDData->mAttachments.end())
-        return setError (VBOX_E_OBJECT_NOT_FOUND,
-            tr ("No hard disk attached to device slot %d on port %d of controller '%ls'"),
-            aDevice, aControllerPort, aControllerName);
+        return setError(VBOX_E_OBJECT_NOT_FOUND,
+                        tr("No hard disk attached to device slot %d on port %d of controller '%ls'"),
+                        aDevice, aControllerPort, aControllerName);
 
     ComObjPtr<HardDiskAttachment> hda = *it;
@@ -2399 +2577 @@
     AutoReadLock alock(this);
 
-    mNetworkAdapters [slot].queryInterfaceTo(adapter);
-
-    return S_OK;
-}
-
-/**
- *  @note Locks this object for reading.
- */
-STDMETHODIMP Machine::GetNextExtraDataKey (IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue)
-{
-    CheckComArgOutPointerValid(aNextKey);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    /* start with nothing found */
-    Bstr("").cloneTo(aNextKey);
-    if (aNextValue)
-        Bstr("").cloneTo(aNextValue);
-
-    /* if we're ready and isConfigLocked() is FALSE then it means
-     * that no config file exists yet, so return shortly */
-    if (!isConfigLocked())
-        return S_OK;
-
-    HRESULT rc = S_OK;
-
-    Bstr bstrInKey(aKey);
-
-    /* serialize file access (prevent writes) */
-    AutoReadLock alock(this);
-
-    try
-    {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file (we don't reuse the existing handle but
-         * request a new one to allow for concurrent multithreaded reads) */
-        File file (File::Mode_Read, Utf8Str (mData->mConfigFileFull));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_Again (tree, file);
-        CheckComRCReturnRC(rc);
-
-        Key machineNode = tree.rootKey().key ("Machine");
-        Key extraDataNode = machineNode.findKey ("ExtraData");
-
-        if (!extraDataNode.isNull())
-        {
-            Key::List items = extraDataNode.keys ("ExtraDataItem");
-            if (items.size())
-            {
-                for (Key::List::const_iterator it = items.begin();
-                     it != items.end(); ++ it)
-                {
-                    Bstr key = (*it).stringValue ("name");
-
-                    /* if we're supposed to return the first one */
-                    if (bstrInKey.isEmpty())
-                    {
-                        key.cloneTo(aNextKey);
-                        if (aNextValue)
-                        {
-                            Bstr val = (*it).stringValue ("value");
-                            val.cloneTo(aNextValue);
-                        }
-                        return S_OK;
-                    }
-
-                    /* did we find the key we're looking for? */
-                    if (key == bstrInKey)
-                    {
-                        ++ it;
-                        /* is there another item? */
-                        if (it != items.end())
-                        {
-                            Bstr key = (*it).stringValue ("name");
-                            key.cloneTo(aNextKey);
-                            if (aNextValue)
-                            {
-                                Bstr val = (*it).stringValue ("value");
-                                val.cloneTo(aNextValue);
-                            }
-                        }
-                        /* else it's the last one, arguments are already NULL */
-                        return S_OK;
-                    }
-                }
-            }
-        }
-
-        /* Here we are when a) there are no items at all or b) there are items
-         * but none of them equals the requested non-NULL key. b) is an
-         * error as well as a) if the key is non-NULL. When the key is NULL
-         * (which is the case only when there are no items), we just fall
-         * through to return NULLs and S_OK. */
-
-        if (!bstrInKey.isEmpty())
-            return setError (VBOX_E_OBJECT_NOT_FOUND,
-                tr ("Could not find the extra data key '%ls'"), bstrInKey.raw());
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
-    }
-
-    return rc;
-}
-
-/**
- *  @note Locks this object for reading.
- */
-STDMETHODIMP Machine::GetExtraData (IN_BSTR aKey, BSTR *aValue)
-{
-    CheckComArgNotNull (aKey);
+    mNetworkAdapters[slot].queryInterfaceTo(adapter);
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::GetExtraDataKeys(ComSafeArrayOut(BSTR, aKeys))
+{
+    if (ComSafeArrayOutIsNull(aKeys))
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    com::SafeArray<BSTR> saKeys(mData->m_pMachineConfigFile->mapExtraDataItems.size());
+    int i = 0;
+    for (settings::ExtraDataItemsMap::const_iterator it = mData->m_pMachineConfigFile->mapExtraDataItems.begin();
+         it != mData->m_pMachineConfigFile->mapExtraDataItems.end();
+         ++it, ++i)
+    {
+        const Utf8Str &strKey = it->first;
+        strKey.cloneTo(&saKeys[i]);
+    }
+    saKeys.detachTo(ComSafeArrayOutArg(aKeys));
+
+    return S_OK;
+  }
+
+  /**
+   *  @note Locks this object for reading.
+   */
+STDMETHODIMP Machine::GetExtraData(IN_BSTR aKey,
+                                   BSTR *aValue)
+{
+    CheckComArgNotNull(aKey);
     CheckComArgOutPointerValid(aValue);
 
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    /* serialize file access (prevent writes) */
-    AutoReadLock alock(this);
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
 
     /* start with nothing found */
     Bstr("").cloneTo(aValue);
 
-    /* if we're ready and isConfigLocked() is FALSE then it means
-     * that no config file exists yet, so return shortly */
-    if (!isConfigLocked())
-        return S_OK;
-
-    Utf8Str val;
-    HRESULT rc = getExtraData(Utf8Str(aKey), val);
-    if (SUCCEEDED(rc))
-        val.cloneTo(aValue);
-
-    return rc;
-}
-
-HRESULT Machine::getExtraData(const Utf8Str &aKey, Utf8Str &aValue)
-{
-    HRESULT rc = S_OK;
-
-    try
-    {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file (we don't reuse the existing handle but
-         * request a new one to allow for concurrent multithreaded reads) */
-        File file (File::Mode_Read, Utf8Str (mData->mConfigFileFull));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_Again (tree, file);
-        CheckComRCReturnRC(rc);
-
-        Key machineNode = tree.rootKey().key ("Machine");
-        Key extraDataNode = machineNode.findKey ("ExtraData");
-
-        if (!extraDataNode.isNull())
-        {
-            /* check if the key exists */
-            Key::List items = extraDataNode.keys ("ExtraDataItem");
-            for (Key::List::const_iterator it = items.begin();
-                 it != items.end(); ++ it)
-            {
-                if (aKey == (*it).stringValue ("name"))
-                {
-                    aValue = (*it).stringValue ("value");
-                    break;
-                }
-            }
-        }
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
-    }
-
-    return rc;
-}
-
-/**
- *  @note Locks mParent for writing + this object for writing.
- */
-STDMETHODIMP Machine::SetExtraData (IN_BSTR aKey, IN_BSTR aValue)
-{
-    CheckComArgNotNull (aKey);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    /* VirtualBox::onExtraDataCanChange() and saveSettings() need mParent
-     * lock (saveSettings() needs a write one). This object's write lock is
-     * also necessary to serialize file access (prevent concurrent reads and
-     * writes). */
-    AutoMultiWriteLock2 alock (mParent, this);
-
-    if (mType == IsSnapshotMachine)
-    {
-        HRESULT rc = checkStateDependency(MutableStateDep);
-        CheckComRCReturnRC(rc);
-    }
+    AutoReadLock alock (this);
+
+    settings::ExtraDataItemsMap::const_iterator it = mData->m_pMachineConfigFile->mapExtraDataItems.find(Utf8Str(aKey));
+    if (it != mData->m_pMachineConfigFile->mapExtraDataItems.end())
+    {
+        // found:
+        const Utf8Str &strValue = it->second;
+        strValue.cloneTo(aValue);
+    }
+
+    return S_OK;
+}
+
+  /**
+   *  @note Locks mParent for writing + this object for writing.
+   */
+STDMETHODIMP Machine::SetExtraData(IN_BSTR aKey, IN_BSTR aValue)
+{
+    CheckComArgNotNull(aKey);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
 
     Bstr val;
@@ -2610 +2650 @@
         val = aValue;
 
-
-    bool changed = false;
-    HRESULT rc = S_OK;
-
-    /* If we're ready and isConfigLocked() is FALSE then it means that no
-     * config file exists yet, so call saveSettings() to create one. */
-    if (!isConfigLocked())
-    {
-        rc = saveSettings();
-        CheckComRCReturnRC(rc);
-    }
-
-    try
-    {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file */
-        File file (mData->mHandleCfgFile, Utf8Str (mData->mConfigFileFull));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_ForUpdate (tree, file);
-        CheckComRCReturnRC(rc);
-
-        const Utf8Str key = aKey;
-        Bstr oldVal("");
-
-        Key machineNode = tree.rootKey().key ("Machine");
-        Key extraDataNode = machineNode.createKey ("ExtraData");
-        Key extraDataItemNode;
-
-        Key::List items = extraDataNode.keys ("ExtraDataItem");
-        for (Key::List::const_iterator it = items.begin();
-             it != items.end(); ++ it)
-        {
-            if (key == (*it).stringValue ("name"))
-            {
-                extraDataItemNode = *it;
-                oldVal = (*it).stringValue ("value");
-                break;
-            }
-        }
-
-        /* When no key is found, oldVal is empty string */
-        changed = oldVal != val;
-
-        if (changed)
-        {
-            /* ask for permission from all listeners */
-            Bstr error;
-            if (!mParent->onExtraDataCanChange (mData->mUuid, aKey, val, error))
-            {
-                const char *sep = error.isEmpty() ? "" : ": ";
-                CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
-                LogWarningFunc (("Someone vetoed! Change refused%s%ls\n",
-                                 sep, err));
-                return setError (E_ACCESSDENIED,
-                    tr ("Could not set extra data because someone refused "
-                        "the requested change of '%ls' to '%ls'%s%ls"),
-                    aKey, val.raw(), sep, err);
-            }
-
-            if (!val.isEmpty())
-            {
-                if (extraDataItemNode.isNull())
-                {
-                    extraDataItemNode = extraDataNode.appendKey ("ExtraDataItem");
-                    extraDataItemNode.setStringValue ("name", key);
-                }
-                extraDataItemNode.setStringValue ("value", Utf8Str (aValue));
-            }
-            else
-            {
-                /* an old value does for sure exist here (XML schema
-                 * guarantees that "value" may not absent in the
-                 * <ExtraDataItem> element) */
-                Assert (!extraDataItemNode.isNull());
-                extraDataItemNode.zap();
-            }
-
-            /* save settings on success */
-            rc = VirtualBox::saveSettingsTree (tree, file,
-                                               mData->mSettingsFileVersion);
-            CheckComRCReturnRC(rc);
-        }
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
+    Utf8Str strKey(aKey);
+    Bstr oldVal("");
+
+    /* VirtualBox::onExtraDataCanChange() and saveSettings() need mParent
+     * lock (saveSettings() needs a write one). This object's write lock is
+     * also necessary to serialize file access (prevent concurrent reads and
+     * writes). */
+    AutoMultiWriteLock2 alock(mParent, this);
+
+    if (mType == IsSnapshotMachine)
+    {
+        HRESULT rc = checkStateDependency(MutableStateDep);
+        CheckComRCReturnRC (rc);
+    }
+
+    settings::ExtraDataItemsMap::const_iterator it = mData->m_pMachineConfigFile->mapExtraDataItems.find(strKey);
+    if (it != mData->m_pMachineConfigFile->mapExtraDataItems.end())
+    {
+        // key exists:
+        const Utf8Str &strValue = it->second;
+        oldVal = strValue;
+    }
+
+    bool fChanged = (oldVal != val);
+    if (fChanged)
+    {
+        /* ask for permission from all listeners */
+        Bstr error;
+        if (!mParent->onExtraDataCanChange(mData->mUuid, aKey, val, error))
+        {
+            const char *sep = error.isEmpty() ? "" : ": ";
+            CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
+            LogWarningFunc(("Someone vetoed! Change refused%s%ls\n",
+                            sep, err));
+            return setError(E_ACCESSDENIED,
+                            tr("Could not set extra data because someone refused the requested change of '%ls' to '%ls'%s%ls"),
+                            aKey,
+                            val.raw(),
+                            sep,
+                            err);
+        }
+
+        mData->m_pMachineConfigFile->mapExtraDataItems[strKey] = val;
+
+        /* save settings on success */
+        HRESULT rc = saveSettings();
+        CheckComRCReturnRC (rc);
     }
 
     /* fire a notification */
-    if (SUCCEEDED(rc) && changed)
-        mParent->onExtraDataChange (mData->mUuid, aKey, aValue);
-
-    return rc;
+    if (fChanged)
+        mParent->onExtraDataChange(mData->mUuid, aKey, aValue);
+
+    return S_OK;
 }
 
@@ -2714 +2712 @@
 
     /* saveSettings() needs mParent lock */
-    AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this);
 
     /* when there was auto-conversion, we want to save the file even if
      * the VM is saved */
-    StateDependency dep = mData->mSettingsFileVersion != VBOX_XML_VERSION_FULL ?
-        MutableOrSavedStateDep : MutableStateDep;
-
-    HRESULT rc = checkStateDependency(dep);
+    HRESULT rc = checkStateDependency(MutableStateDep);
     CheckComRCReturnRC(rc);
 
     /* the settings file path may never be null */
-    ComAssertRet (mData->mConfigFileFull, E_FAIL);
-
-    /* save all VM data excluding snapshots */
-    return saveSettings();
-}
-
-STDMETHODIMP Machine::SaveSettingsWithBackup (BSTR *aBakFileName)
-{
-    CheckComArgOutPointerValid(aBakFileName);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    /* saveSettings() needs mParent lock */
-    AutoMultiWriteLock2 alock (mParent, this);
-
-    /* when there was auto-conversion, we want to save the file even if
-     * the VM is saved */
-    StateDependency dep = mData->mSettingsFileVersion != VBOX_XML_VERSION_FULL ?
-        MutableOrSavedStateDep : MutableStateDep;
-
-    HRESULT rc = checkStateDependency(dep);
-    CheckComRCReturnRC(rc);
-
-    /* the settings file path may never be null */
-    ComAssertRet (mData->mConfigFileFull, E_FAIL);
-
-    /* perform backup only when there was auto-conversion */
-    if (mData->mSettingsFileVersion != VBOX_XML_VERSION_FULL)
-    {
-        Bstr bakFileName;
-
-        HRESULT rc = VirtualBox::backupSettingsFile (mData->mConfigFileFull,
-                                                     mData->mSettingsFileVersion,
-                                                     bakFileName);
-        CheckComRCReturnRC(rc);
-
-        bakFileName.cloneTo(aBakFileName);
-    }
+    ComAssertRet(!mData->m_strConfigFileFull.isEmpty(), E_FAIL);
 
     /* save all VM data excluding snapshots */
@@ -2799 +2756 @@
 
     if (mData->mRegistered)
-        return setError (VBOX_E_INVALID_VM_STATE,
-            tr ("Cannot delete settings of a registered machine"));
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("Cannot delete settings of a registered machine"));
 
     /* delete the settings only when the file actually exists */
-    if (isConfigLocked())
-    {
-        unlockConfig();
-        int vrc = RTFileDelete (Utf8Str (mData->mConfigFileFull));
+    if (mData->m_pMachineConfigFile->fileExists())
+    {
+        int vrc = RTFileDelete(mData->m_strConfigFileFull.c_str());
         if (RT_FAILURE(vrc))
-            return setError (VBOX_E_IPRT_ERROR,
-                tr ("Could not delete the settings file '%ls' (%Rrc)"),
-                mData->mConfigFileFull.raw(), vrc);
+            return setError(VBOX_E_IPRT_ERROR,
+                            tr("Could not delete the settings file '%s' (%Rrc)"),
+                            mData->m_strConfigFileFull.raw(),
+                            vrc);
 
         /* delete the Logs folder, nothing important should be left
@@ -2816 +2773 @@
          * some private files there that we don't want to delete) */
         Utf8Str logFolder;
-        getLogFolder (logFolder);
+        getLogFolder(logFolder);
         Assert(logFolder.length());
-        if (RTDirExists(logFolder))
+        if (RTDirExists(logFolder.c_str()))
         {
             /* Delete all VBox.log[.N] files from the Logs folder
@@ -2824 +2781 @@
              * Console::powerUpThread()). Also, delete the VBox.png[.N]
              * files that may have been created by the GUI. */
-            Utf8Str log = Utf8StrFmt ("%s/VBox.log", logFolder.raw());
-            RTFileDelete (log);
-            log = Utf8StrFmt ("%s/VBox.png", logFolder.raw());
-            RTFileDelete (log);
+            Utf8Str log = Utf8StrFmt("%s/VBox.log", logFolder.raw());
+            RTFileDelete(log.c_str());
+            log = Utf8StrFmt("%s/VBox.png", logFolder.raw());
+            RTFileDelete(log.c_str());
             for (int i = 3; i >= 0; i--)
             {
-                log = Utf8StrFmt ("%s/VBox.log.%d", logFolder.raw(), i);
-                RTFileDelete (log);
-                log = Utf8StrFmt ("%s/VBox.png.%d", logFolder.raw(), i);
-                RTFileDelete (log);
+                log = Utf8StrFmt("%s/VBox.log.%d", logFolder.raw(), i);
+                RTFileDelete(log.c_str());
+                log = Utf8StrFmt("%s/VBox.png.%d", logFolder.raw(), i);
+                RTFileDelete(log.c_str());
             }
 
-            RTDirRemove (logFolder);
+            RTDirRemove(logFolder.c_str());
         }
 
@@ -2844 +2801 @@
         Utf8Str snapshotFolder(mUserData->mSnapshotFolderFull);
         Assert(snapshotFolder.length());
-        if (RTDirExists(snapshotFolder))
-            RTDirRemove(snapshotFolder);
+        if (RTDirExists(snapshotFolder.c_str()))
+            RTDirRemove(snapshotFolder.c_str());
 
         /* delete the directory that contains the settings file, but only
@@ -2852 +2809 @@
         {
             Utf8Str settingsDir;
-            if (isInOwnDir (&settingsDir))
-                RTDirRemove (settingsDir);
+            if (isInOwnDir(&settingsDir))
+                RTDirRemove(settingsDir.c_str());
         }
     }
@@ -2904 +2861 @@
 }
 
-STDMETHODIMP
-Machine::CreateSharedFolder (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
-{
-    CheckComArgNotNull (aName);
-    CheckComArgNotNull (aHostPath);
+STDMETHODIMP Machine::CreateSharedFolder (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
+{
+    CheckComArgNotNull(aName);
+    CheckComArgNotNull(aHostPath);
 
     AutoCaller autoCaller(this);
@@ -2921 +2877 @@
     rc = findSharedFolder (aName, sharedFolder, false /* aSetError */);
     if (SUCCEEDED(rc))
-        return setError (VBOX_E_OBJECT_IN_USE,
-            tr ("Shared folder named '%ls' already exists"), aName);
+        return setError(VBOX_E_OBJECT_IN_USE,
+                        tr("Shared folder named '%ls' already exists"),
+                        aName);
 
     sharedFolder.createObject();
@@ -2979 +2936 @@
 
         if (mData->mSession.mState != SessionState_Open)
-            return setError (VBOX_E_INVALID_VM_STATE,
-                tr ("Machine session is not open (session state: %d)"),
-                mData->mSession.mState);
+            return setError(VBOX_E_INVALID_VM_STATE,
+                            tr("Machine session is not open (session state: %d)"),
+                            mData->mSession.mState);
 
         directControl = mData->mSession.mDirectControl;
@@ -3006 +2963 @@
 
         if (mData->mSession.mState != SessionState_Open)
-            return setError (E_FAIL,
-                tr ("Machine session is not open (session state: %d)"),
-                mData->mSession.mState);
+            return setError(E_FAIL,
+                            tr("Machine session is not open (session state: %d)"),
+                            mData->mSession.mState);
 
         directControl = mData->mSession.mDirectControl;
@@ -3021 +2978 @@
 }
 
-STDMETHODIMP Machine::GetGuestProperty (IN_BSTR aName, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags)
+STDMETHODIMP Machine::GetGuestProperty(IN_BSTR aName,
+                                       BSTR *aValue,
+                                       ULONG64 *aTimestamp,
+                                       BSTR *aFlags)
 {
 #if !defined (VBOX_WITH_GUEST_PROPS)
     ReturnComNotImplemented();
 #else
-    CheckComArgNotNull (aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aValue);
     CheckComArgOutPointerValid(aTimestamp);
@@ -3039 +2999 @@
     HRESULT rc = E_FAIL;
 
+    Utf8Str strName(aName);
+
     if (!mHWData->mPropertyServiceActive)
     {
         bool found = false;
         for (HWData::GuestPropertyList::const_iterator it = mHWData->mGuestProperties.begin();
-             (it != mHWData->mGuestProperties.end()) && !found; ++it)
-        {
-            if (it->mName == aName)
+             (it != mHWData->mGuestProperties.end()) && !found;
+             ++it)
+        {
+            if (it->strName == strName)
             {
                 char szFlags[MAX_FLAGS_LEN + 1];
-                it->mValue.cloneTo(aValue);
+                it->strValue.cloneTo(aValue);
                 *aTimestamp = it->mTimestamp;
-                writeFlags (it->mFlags, szFlags);
-                Bstr (szFlags).cloneTo(aFlags);
+                writeFlags(it->mFlags, szFlags);
+                Bstr(szFlags).cloneTo(aFlags);
                 found = true;
             }
@@ -3102 +3065 @@
     using namespace guestProp;
 
-    CheckComArgNotNull (aName);
-    CheckComArgNotNull (aValue);
+    CheckComArgNotNull(aName);
+    CheckComArgNotNull(aValue);
     if ((aFlags != NULL) && !VALID_PTR (aFlags))
         return E_INVALIDARG;
@@ -3148 +3111 @@
             if (SUCCEEDED(rc))
             {
-                for (HWData::GuestPropertyList::iterator it =
-                        mHWData->mGuestProperties.begin();
-                    it != mHWData->mGuestProperties.end(); ++ it)
-                    if (it->mName == aName)
+                for (HWData::GuestPropertyList::iterator it = mHWData->mGuestProperties.begin();
+                     it != mHWData->mGuestProperties.end();
+                     ++it)
+                    if (it->strName == utf8Name)
                     {
                         property = *it;
                         if (it->mFlags & (RDONLYHOST))
-                            rc = setError (E_ACCESSDENIED,
-                                tr ("The property '%ls' cannot be changed by the host"),
-                                aName);
+                            rc = setError(E_ACCESSDENIED,
+                                          tr("The property '%ls' cannot be changed by the host"),
+                                          aName);
                         else
                         {
@@ -3164 +3127 @@
                             * get a new one. */
                             for (it = mHWData->mGuestProperties.begin();
-                                it->mName != aName; ++ it)
+                                 it->strName != utf8Name;
+                                 ++it)
                                 ;
                             mHWData->mGuestProperties.erase (it);
@@ -3177 +3141 @@
                 {
                     RTTIMESPEC time;
-                    property.mValue = aValue;
-                    property.mTimestamp = RTTimeSpecGetNano(RTTimeNow (&time));
+                    property.strValue = aValue;
+                    property.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
                     if (aFlags != NULL)
                         property.mFlags = fFlags;
@@ -3188 +3152 @@
                 RTTIMESPEC time;
                 mHWData.backup();
-                property.mName = aName;
-                property.mValue = aValue;
-                property.mTimestamp = RTTimeSpecGetNano(RTTimeNow (&time));
+                property.strName = aName;
+                property.strValue = aValue;
+                property.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
                 property.mFlags = fFlags;
                 mHWData->mGuestProperties.push_back (property);
@@ -3234 +3198 @@
 }
 
-STDMETHODIMP Machine::
-EnumerateGuestProperties (IN_BSTR aPatterns, ComSafeArrayOut(BSTR, aNames),
-                          ComSafeArrayOut(BSTR, aValues),
-                          ComSafeArrayOut(ULONG64, aTimestamps),
-                          ComSafeArrayOut(BSTR, aFlags))
+STDMETHODIMP Machine::EnumerateGuestProperties(IN_BSTR aPatterns,
+                                               ComSafeArrayOut(BSTR, aNames),
+                                               ComSafeArrayOut(BSTR, aValues),
+                                               ComSafeArrayOut(ULONG64, aTimestamps),
+                                               ComSafeArrayOut(BSTR, aFlags))
 {
 #if !defined (VBOX_WITH_GUEST_PROPS)
@@ -3259 +3223 @@
     HRESULT rc = E_FAIL;
 
+    Utf8Str strPatterns(aPatterns);
+
     bool matchAll = false;
     if ((NULL == aPatterns) || (0 == aPatterns[0]))
@@ -3265 +3231 @@
     {
 
-/*
- * Look for matching patterns and build up a list.
- */
+        /*
+         * Look for matching patterns and build up a list.
+         */
         HWData::GuestPropertyList propList;
         for (HWData::GuestPropertyList::iterator it = mHWData->mGuestProperties.begin();
-             it != mHWData->mGuestProperties.end(); ++it)
+             it != mHWData->mGuestProperties.end();
+             ++it)
             if (   matchAll
-                || RTStrSimplePatternMultiMatch (Utf8Str (aPatterns).raw(),
-                                                 RTSTR_MAX,
-                                                 Utf8Str (it->mName).raw(),
-                                                 RTSTR_MAX, NULL)
+                || RTStrSimplePatternMultiMatch(strPatterns.raw(),
+                                                RTSTR_MAX,
+                                                it->strName.raw(),
+                                                RTSTR_MAX, NULL)
                )
-                propList.push_back (*it);
-
-/*
- * And build up the arrays for returning the property information.
- */
+                propList.push_back(*it);
+
+        /*
+         * And build up the arrays for returning the property information.
+         */
         size_t cEntries = propList.size();
         SafeArray<BSTR> names (cEntries);
@@ -3289 +3256 @@
         size_t iProp = 0;
         for (HWData::GuestPropertyList::iterator it = propList.begin();
-             it != propList.end(); ++it)
+             it != propList.end();
+             ++it)
         {
              char szFlags[MAX_FLAGS_LEN + 1];
-             it->mName.cloneTo(&names[iProp]);
-             it->mValue.cloneTo(&values[iProp]);
+             it->strName.cloneTo(&names[iProp]);
+             it->strValue.cloneTo(&values[iProp]);
              timestamps[iProp] = it->mTimestamp;
-             writeFlags (it->mFlags, szFlags);
-             Bstr (szFlags).cloneTo(&flags[iProp]);
+             writeFlags(it->mFlags, szFlags);
+             Bstr(szFlags).cloneTo(&flags[iProp]);
              ++iProp;
         }
@@ -3307 +3275 @@
     else
     {
-        ComPtr<IInternalSessionControl> directControl =
-            mData->mSession.mDirectControl;
+        ComPtr<IInternalSessionControl> directControl = mData->mSession.mDirectControl;
 
         /* just be on the safe side when calling another process */
@@ -3316 +3283 @@
             rc = E_FAIL;
         else
-            rc = directControl->EnumerateGuestProperties (aPatterns,
-                                                          ComSafeArrayOutArg(aNames),
-                                                          ComSafeArrayOutArg(aValues),
-                                                          ComSafeArrayOutArg(aTimestamps),
-                                                          ComSafeArrayOutArg(aFlags));
+            rc = directControl->EnumerateGuestProperties(aPatterns,
+                                                         ComSafeArrayOutArg(aNames),
+                                                         ComSafeArrayOutArg(aValues),
+                                                         ComSafeArrayOutArg(aTimestamps),
+                                                         ComSafeArrayOutArg(aFlags));
     }
     return rc;
@@ -3326 +3293 @@
 }
 
-STDMETHODIMP Machine::
-GetHardDiskAttachmentsOfController(IN_BSTR aName, ComSafeArrayOut(IHardDiskAttachment *, aAttachments))
+STDMETHODIMP Machine:: GetHardDiskAttachmentsOfController(IN_BSTR aName,
+                                                          ComSafeArrayOut(IHardDiskAttachment*, aAttachments))
 {
     HDData::AttachmentList atts;
@@ -3340 +3307 @@
 }
 
-STDMETHODIMP Machine::
-AddStorageController(IN_BSTR aName,
-                     StorageBus_T aConnectionType,
-                     IStorageController **controller)
+STDMETHODIMP Machine::AddStorageController(IN_BSTR aName,
+                                           StorageBus_T aConnectionType,
+                                           IStorageController **controller)
 {
     CheckComArgStrNotEmptyOrNull(aName);
@@ -3385 +3351 @@
 }
 
-STDMETHODIMP Machine::
-GetStorageControllerByName(IN_BSTR aName, IStorageController **aStorageController)
+STDMETHODIMP Machine::GetStorageControllerByName(IN_BSTR aName,
+                                                 IStorageController **aStorageController)
 {
     CheckComArgStrNotEmptyOrNull(aName);
@@ -3431 +3397 @@
         {
             if ((*it)->controller() == aName)
-                return setError (VBOX_E_OBJECT_IN_USE,
-                    tr ("Storage controller named '%ls' has still devices attached"), aName);
+                return setError(VBOX_E_OBJECT_IN_USE,
+                                tr("Storage controller named '%ls' has still devices attached"),
+                                aName);
         }
     }
@@ -3460 +3427 @@
  *  @note locks this object for reading.
  */
-HRESULT Machine::saveRegistryEntry (settings::Key &aEntryNode)
-{
-    AssertReturn(!aEntryNode.isNull(), E_FAIL);
-
+HRESULT Machine::saveRegistryEntry(settings::MachineRegistryEntry &data)
+{
     AutoLimitedCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -3469 +3434 @@
     AutoReadLock alock(this);
 
-    /* UUID */
-    aEntryNode.setValue <Guid> ("uuid", mData->mUuid);
-    /* settings file name (possibly, relative) */
-    aEntryNode.setValue <Bstr> ("src", mData->mConfigFile);
+    data.uuid = mData->mUuid;
+    data.strSettingsFile = mData->m_strConfigFile;
 
     return S_OK;
@@ -3488 +3451 @@
  * @note Locks this object for reading.
  */
-int Machine::calculateFullPath (const char *aPath, Utf8Str &aResult)
+int Machine::calculateFullPath(const Utf8Str &strPath, Utf8Str &aResult)
 {
     AutoCaller autoCaller(this);
@@ -3495 +3458 @@
     AutoReadLock alock(this);
 
-    AssertReturn(!mData->mConfigFileFull.isNull(), VERR_GENERAL_FAILURE);
-
-    Utf8Str strSettingsDir = mData->mConfigFileFull;
+    AssertReturn (!mData->m_strConfigFileFull.isEmpty(), VERR_GENERAL_FAILURE);
+
+    Utf8Str strSettingsDir = mData->m_strConfigFileFull;
 
     strSettingsDir.stripFilename();
     char folder[RTPATH_MAX];
-    int vrc = RTPathAbsEx(strSettingsDir, aPath, folder, sizeof(folder));
+    int vrc = RTPathAbsEx(strSettingsDir.c_str(), strPath.c_str(), folder, sizeof(folder));
     if (RT_SUCCESS(vrc))
         aResult = folder;
@@ -3519 +3482 @@
  * @note Locks this object for reading.
  */
-void Machine::calculateRelativePath (const char *aPath, Utf8Str &aResult)
+void Machine::calculateRelativePath(const Utf8Str &strPath, Utf8Str &aResult)
 {
     AutoCaller autoCaller(this);
@@ -3526 +3489 @@
     AutoReadLock alock(this);
 
-    AssertReturnVoid (!mData->mConfigFileFull.isNull());
-
-    Utf8Str settingsDir = mData->mConfigFileFull;
+    AssertReturnVoid (!mData->m_strConfigFileFull.isEmpty());
+
+    Utf8Str settingsDir = mData->m_strConfigFileFull;
 
     settingsDir.stripFilename();
-    if (RTPathStartsWith(aPath, settingsDir))
+    if (RTPathStartsWith(strPath.c_str(), settingsDir.c_str()))
     {
         /* when assigning, we create a separate Utf8Str instance because both
@@ -3538 +3501 @@
          * first, and since its the same as aPath, an attempt to copy garbage
          * will be made. */
-        aResult = Utf8Str(aPath + settingsDir.length() + 1);
+        aResult = Utf8Str(strPath.c_str() + settingsDir.length() + 1);
     }
 }
@@ -3572 +3535 @@
  *        lock).
  */
-HRESULT Machine::openSession (IInternalSessionControl *aControl)
+HRESULT Machine::openSession(IInternalSessionControl *aControl)
 {
     LogFlowThisFuncEnter();
@@ -3584 +3547 @@
 
     if (!mData->mRegistered)
-        return setError (E_UNEXPECTED,
-            tr ("The machine '%ls' is not registered"), mUserData->mName.raw());
+        return setError(E_UNEXPECTED,
+                        tr("The machine '%ls' is not registered"),
+                        mUserData->mName.raw());
 
     LogFlowThisFunc(("mSession.mState=%d\n", mData->mSession.mState));
@@ -3591 +3555 @@
     if (mData->mSession.mState == SessionState_Open ||
         mData->mSession.mState == SessionState_Closing)
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("A session for the machine '%ls' is currently open "
-                "(or being closed)"),
-            mUserData->mName.raw());
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("A session for the machine '%ls' is currently open (or being closed)"),
+                        mUserData->mName.raw());
 
     /* may not be busy */
@@ -3616 +3579 @@
 
         if (mData->mSession.mPid != pid)
-            return setError (E_ACCESSDENIED,
-                tr ("An unexpected process (PID=0x%08X) has tried to open a direct "
-                    "session with the machine named '%ls', while only a process "
-                    "started by OpenRemoteSession (PID=0x%08X) is allowed"),
-                pid, mUserData->mName.raw(), mData->mSession.mPid);
+            return setError(E_ACCESSDENIED,
+                            tr("An unexpected process (PID=0x%08X) has tried to open a direct "
+                               "session with the machine named '%ls', while only a process "
+                               "started by OpenRemoteSession (PID=0x%08X) is allowed"),
+                            pid, mUserData->mName.raw(), mData->mSession.mPid);
     }
 
@@ -3698 +3661 @@
 
                 /* The failure may occur w/o any error info (from RPC), so provide one */
-                if (FAILED (rc))
-                    setError (VBOX_E_VM_ERROR,
-                        tr ("Failed to assign the machine to the remote session (%Rrc)"), rc);
+                if (FAILED(rc))
+                    setError(VBOX_E_VM_ERROR,
+                             tr("Failed to assign the machine to the remote session (%Rrc)"), rc);
             }
 
-            if (FAILED (rc))
+            if (FAILED(rc))
                 aControl->Uninitialize();
         }
@@ -3722 +3685 @@
          * SessionMachine::uninit() to reap the child process later. */
 
-        if (FAILED (rc))
+        if (FAILED(rc))
         {
             /* Close the remote session, remove the remote control from the list
@@ -3773 +3736 @@
 
     /* uninitialize the created session machine on failure */
-    if (FAILED (rc))
+    if (FAILED(rc))
         sessionMachine->uninit();
 
@@ -3785 +3748 @@
  *        (inside the lock).
  */
-HRESULT Machine::openRemoteSession (IInternalSessionControl *aControl,
-                                    IN_BSTR aType, IN_BSTR aEnvironment,
-                                    Progress *aProgress)
+HRESULT Machine::openRemoteSession(IInternalSessionControl *aControl,
+                                   IN_BSTR aType,
+                                   IN_BSTR aEnvironment,
+                                   Progress *aProgress)
 {
     LogFlowThisFuncEnter();
@@ -3800 +3764 @@
 
     if (!mData->mRegistered)
-        return setError (E_UNEXPECTED,
-            tr ("The machine '%ls' is not registered"), mUserData->mName.raw());
+        return setError(E_UNEXPECTED,
+                        tr("The machine '%ls' is not registered"),
+                        mUserData->mName.raw());
 
     LogFlowThisFunc(("mSession.mState=%d\n", mData->mSession.mState));
@@ -3808 +3773 @@
         mData->mSession.mState == SessionState_Spawning ||
         mData->mSession.mState == SessionState_Closing)
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("A session for the machine '%ls' is currently open "
-                "(or being opened or closed)"),
-            mUserData->mName.raw());
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("A session for the machine '%ls' is currently open (or being opened or closed)"),
+                        mUserData->mName.raw());
 
     /* may not be busy */
@@ -3817 +3781 @@
 
     /* get the path to the executable */
-    char path [RTPATH_MAX];
-    RTPathAppPrivateArch (path, RTPATH_MAX);
-    size_t sz = strlen (path);
-    path [sz++] = RTPATH_DELIMITER;
-    path [sz] = 0;
-    char *cmd = path + sz;
+    char szPath[RTPATH_MAX];
+    RTPathAppPrivateArch(szPath, RTPATH_MAX);
+    size_t sz = strlen(szPath);
+    szPath[sz++] = RTPATH_DELIMITER;
+    szPath[sz] = 0;
+    char *cmd = szPath + sz;
     sz = RTPATH_MAX - sz;
 
@@ -3837 +3801 @@
         {
             /* clone the current environment */
-            int vrc2 = RTEnvClone (&env, RTENV_DEFAULT);
-            AssertRCBreakStmt (vrc2, vrc = vrc2);
-
-            newEnvStr = RTStrDup (Utf8Str (aEnvironment));
-            AssertPtrBreakStmt (newEnvStr, vrc = vrc2);
+            int vrc2 = RTEnvClone(&env, RTENV_DEFAULT);
+            AssertRCBreakStmt(vrc2, vrc = vrc2);
+
+            newEnvStr = RTStrDup(Utf8Str(aEnvironment).c_str());
+            AssertPtrBreakStmt(newEnvStr, vrc = vrc2);
 
             /* put new variables to the environment
@@ -3876 +3840 @@
 
         if (newEnvStr != NULL)
-            RTStrFree (newEnvStr);
+            RTStrFree(newEnvStr);
     }
 
@@ -3895 +3859 @@
         Utf8Str idStr = mData->mUuid.toString();
 # ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
-        const char * args[] = {path, "--startvm", idStr, 0 };
+        const char * args[] = {szPath, "--startvm", idStr.c_str(), 0 };
 # else
         Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0 };
+        const char * args[] = {szPath, "--comment", name.c_str(), "--startvm", idStr.c_str(), 0 };
 # endif
-        vrc = RTProcCreate (path, args, env, 0, &pid);
+        vrc = RTProcCreate(szPath, args, env, 0, &pid);
     }
 #else /* !VBOX_WITH_QTGUI */
@@ -3918 +3882 @@
         Utf8Str idStr = mData->mUuid.toString();
 # ifdef RT_OS_WINDOWS
-        const char * args[] = {path, "--startvm", idStr, 0 };
+        const char * args[] = {szPath, "--startvm", idStr.c_str(), 0 };
 # else
         Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0 };
+        const char * args[] = {szPath, "--comment", name.c_str(), "--startvm", idStr.c_str(), 0 };
 # endif
-        vrc = RTProcCreate (path, args, env, 0, &pid);
+        vrc = RTProcCreate(szPath, args, env, 0, &pid);
     }
 #else /* !VBOX_WITH_VBOXSDL */
@@ -3947 +3911 @@
         /* Leave space for 2 args, as "headless" needs --vrdp off on non-OSE. */
 # ifdef RT_OS_WINDOWS
-        const char * args[] = {path, "--startvm", idStr, 0, 0, 0 };
+        const char * args[] = {szPath, "--startvm", idStr.c_str(), 0, 0, 0 };
 # else
         Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0, 0, 0 };
+        const char * args[] ={szPath, "--comment", name.c_str(), "--startvm", idStr.c_str(), 0, 0, 0 };
 # endif
 #ifdef VBOX_WITH_VRDP
@@ -3965 +3929 @@
             args[pos] = "--capture";
         }
-        vrc = RTProcCreate (path, args, env, 0, &pid);
+        vrc = RTProcCreate(szPath, args, env, 0, &pid);
     }
 #else /* !VBOX_WITH_HEADLESS */
@@ -4001 +3965 @@
     LogFlowThisFunc(("AssignMachine (NULL) returned %08X\n", rc));
 
-    if (FAILED (rc))
+    if (FAILED(rc))
     {
         /* restore the session state */
         mData->mSession.mState = SessionState_Closed;
         /* The failure may occur w/o any error info (from RPC), so provide one */
-        return setError (VBOX_E_VM_ERROR,
-            tr ("Failed to assign the machine to the session (%Rrc)"), rc);
+        return setError(VBOX_E_VM_ERROR,
+                        tr("Failed to assign the machine to the session (%Rrc)"), rc);
     }
 
@@ -4083 +4047 @@
 
     /* The failure may occur w/o any error info (from RPC), so provide one */
-    if (FAILED (rc))
-        return setError (VBOX_E_VM_ERROR,
-            tr ("Failed to assign the machine to the session (%Rrc)"), rc);
+    if (FAILED(rc))
+        return setError(VBOX_E_VM_ERROR,
+                        tr("Failed to assign the machine to the session (%Rrc)"),
+                        rc);
 
     alock.enter();
@@ -4094 +4059 @@
         aControl->Uninitialize();
 
-        return setError (VBOX_E_INVALID_SESSION_STATE,
-            tr ("The machine '%ls' does not have an open session"),
-            mUserData->mName.raw());
+        return setError(VBOX_E_INVALID_SESSION_STATE,
+                        tr("The machine '%ls' does not have an open session"),
+                        mUserData->mName.raw());
     }
 
@@ -4246 +4211 @@
     /* the process was already unexpectedly terminated, we just need to set an
      * error and finalize session spawning */
-    rc = setError (E_FAIL,
-                   tr ("Virtual machine '%ls' has terminated unexpectedly "
-                       "during startup"),
-                   name().raw());
+    rc = setError(E_FAIL,
+                  tr("Virtual machine '%ls' has terminated unexpectedly during startup"),
+                  name().raw());
 #else
 
@@ -4257 +4221 @@
 
     if (vrc != VERR_PROCESS_RUNNING)
-        rc = setError (E_FAIL,
-                       tr ("Virtual machine '%ls' has terminated unexpectedly "
-                           "during startup"),
-                       name().raw());
+        rc = setError(E_FAIL,
+                      tr("Virtual machine '%ls' has terminated unexpectedly during startup"),
+                      name().raw());
 #endif
 
-    if (FAILED (rc))
+    if (FAILED(rc))
     {
         /* Close the remote session, remove the remote control from the list
@@ -4351 +4314 @@
     {
         if (mData->mRegistered)
-            return setError (VBOX_E_INVALID_OBJECT_STATE,
-                tr ("The machine '%ls' with UUID {%s} is already registered"),
-                mUserData->mName.raw(),
-                mData->mUuid.toString().raw());
+            return setError(VBOX_E_INVALID_OBJECT_STATE,
+                            tr("The machine '%ls' with UUID {%s} is already registered"),
+                            mUserData->mName.raw(),
+                            mData->mUuid.toString().raw());
     }
     else
     {
         if (mData->mMachineState == MachineState_Saved)
-            return setError (VBOX_E_INVALID_VM_STATE,
-                tr ("Cannot unregister the machine '%ls' because it "
-                    "is in the Saved state"),
-                mUserData->mName.raw());
+            return setError(VBOX_E_INVALID_VM_STATE,
+                            tr("Cannot unregister the machine '%ls' because it is in the Saved state"),
+                            mUserData->mName.raw());
 
         size_t snapshotCount = 0;
@@ -4368 +4330 @@
             snapshotCount = mData->mFirstSnapshot->getAllChildrenCount() + 1;
         if (snapshotCount)
-            return setError (VBOX_E_INVALID_OBJECT_STATE,
-                tr ("Cannot unregister the machine '%ls' because it "
-                    "has %d snapshots"),
-                mUserData->mName.raw(), snapshotCount);
+            return setError(VBOX_E_INVALID_OBJECT_STATE,
+                            tr("Cannot unregister the machine '%ls' because it has %d snapshots"),
+                            mUserData->mName.raw(), snapshotCount);
 
         if (mData->mSession.mState != SessionState_Closed)
-            return setError (VBOX_E_INVALID_OBJECT_STATE,
-                tr ("Cannot unregister the machine '%ls' because it has an "
-                    "open session"),
-                mUserData->mName.raw());
+            return setError(VBOX_E_INVALID_OBJECT_STATE,
+                            tr("Cannot unregister the machine '%ls' because it has an open session"),
+                            mUserData->mName.raw());
 
         if (mHDData->mAttachments.size() != 0)
-            return setError (VBOX_E_INVALID_OBJECT_STATE,
-                tr ("Cannot unregister the machine '%ls' because it "
-                    "has %d hard disks attached"),
-                mUserData->mName.raw(), mHDData->mAttachments.size());
+            return setError(VBOX_E_INVALID_OBJECT_STATE,
+                            tr("Cannot unregister the machine '%ls' because it has %d hard disks attached"),
+                            mUserData->mName.raw(),
+                            mHDData->mAttachments.size());
 
         /* Note that we do not prevent unregistration of a DVD or Floppy image
@@ -4396 +4356 @@
      * isConfigLocked() is FALSE then it means that no config file exists yet,
      * so create it by calling saveSettings() too. */
-    if (isModified() || (aRegistered && !isConfigLocked()))
+    if (    isModified()
+         || (aRegistered && !mData->m_pMachineConfigFile->fileExists())
+       )
     {
         rc = saveSettings();
@@ -4465 +4427 @@
             AssertFailed();
 
-            return setError (E_ACCESSDENIED,
-                tr ("Machine state change is in progress. "
-                    "Please retry the operation later."));
+            return setError(E_ACCESSDENIED,
+                            tr("Machine state change is in progress. Please retry the operation later."));
         }
 
@@ -4554 +4515 @@
                  mData->mMachineState > MachineState_Paused ||
                  mData->mMachineState == MachineState_Saved))
-                return setError (VBOX_E_INVALID_VM_STATE,
-                    tr ("The machine is not mutable (state is %d)"),
-                    mData->mMachineState);
+                return setError(VBOX_E_INVALID_VM_STATE,
+                                tr("The machine is not mutable (state is %d)"),
+                                mData->mMachineState);
             break;
         }
@@ -4564 +4525 @@
                 (mType != IsSessionMachine ||
                  mData->mMachineState > MachineState_Paused))
-                return setError (VBOX_E_INVALID_VM_STATE,
-                    tr ("The machine is not mutable (state is %d)"),
-                    mData->mMachineState);
+                return setError(VBOX_E_INVALID_VM_STATE,
+                                tr("The machine is not mutable (state is %d)"),
+                                mData->mMachineState);
             break;
         }
@@ -4572 +4533 @@
 
     return S_OK;
-}
-
-/**
- * Helper to initialize all associated child objects and allocate data
- * structures.
- *
- * This method must be called as a part of the object's initialization procedure
- * (usually done in the #init() method).
- *
- * @note Must be called only from #init() or from #registeredInit().
- */
-HRESULT Machine::initDataAndChildObjects()
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-    AssertComRCReturn (autoCaller.state() == InInit ||
-                       autoCaller.state() == Limited, E_FAIL);
-
-    AssertReturn(!mData->mAccessible, E_FAIL);
-
-    /* allocate data structures */
-    mSSData.allocate();
-    mUserData.allocate();
-    mHWData.allocate();
-    mHDData.allocate();
-    mStorageControllers.allocate();
-
-    /* initialize mOSTypeId */
-    mUserData->mOSTypeId = mParent->getUnknownOSType()->id();
-
-    /* create associated BIOS settings object */
-    unconst(mBIOSSettings).createObject();
-    mBIOSSettings->init (this);
-
-#ifdef VBOX_WITH_VRDP
-    /* create an associated VRDPServer object (default is disabled) */
-    unconst(mVRDPServer).createObject();
-    mVRDPServer->init (this);
-#endif
-
-    /* create an associated DVD drive object */
-    unconst(mDVDDrive).createObject();
-    mDVDDrive->init (this);
-
-    /* create an associated floppy drive object */
-    unconst(mFloppyDrive).createObject();
-    mFloppyDrive->init (this);
-
-    /* create associated serial port objects */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
-    {
-        unconst(mSerialPorts [slot]).createObject();
-        mSerialPorts [slot]->init (this, slot);
-    }
-
-    /* create associated parallel port objects */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
-    {
-        unconst(mParallelPorts [slot]).createObject();
-        mParallelPorts [slot]->init (this, slot);
-    }
-
-    /* create the audio adapter object (always present, default is disabled) */
-    unconst(mAudioAdapter).createObject();
-    mAudioAdapter->init (this);
-
-    /* create the USB controller object (always present, default is disabled) */
-    unconst(mUSBController).createObject();
-    mUSBController->init (this);
-
-    /* create associated network adapter objects */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++)
-    {
-        unconst(mNetworkAdapters [slot]).createObject();
-        mNetworkAdapters [slot]->init (this, slot);
-    }
-
-    return S_OK;
-}
-
-/**
- * Helper to uninitialize all associated child objects and to free all data
- * structures.
- *
- * This method must be called as a part of the object's uninitialization
- * procedure (usually done in the #uninit() method).
- *
- * @note Must be called only from #uninit() or from #registeredInit().
- */
-void Machine::uninitDataAndChildObjects()
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
-    AssertComRCReturnVoid (autoCaller.state() == InUninit ||
-                           autoCaller.state() == Limited);
-
-    /* uninit all children using addDependentChild()/removeDependentChild()
-     * in their init()/uninit() methods */
-    uninitDependentChildren();
-
-    /* tell all our other child objects we've been uninitialized */
-
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++)
-    {
-        if (mNetworkAdapters [slot])
-        {
-            mNetworkAdapters [slot]->uninit();
-            unconst(mNetworkAdapters [slot]).setNull();
-        }
-    }
-
-    if (mUSBController)
-    {
-        mUSBController->uninit();
-        unconst(mUSBController).setNull();
-    }
-
-    if (mAudioAdapter)
-    {
-        mAudioAdapter->uninit();
-        unconst(mAudioAdapter).setNull();
-    }
-
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
-    {
-        if (mParallelPorts [slot])
-        {
-            mParallelPorts [slot]->uninit();
-            unconst(mParallelPorts [slot]).setNull();
-        }
-    }
-
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
-    {
-        if (mSerialPorts [slot])
-        {
-            mSerialPorts [slot]->uninit();
-            unconst(mSerialPorts [slot]).setNull();
-        }
-    }
-
-    if (mFloppyDrive)
-    {
-        mFloppyDrive->uninit();
-        unconst(mFloppyDrive).setNull();
-    }
-
-    if (mDVDDrive)
-    {
-        mDVDDrive->uninit();
-        unconst(mDVDDrive).setNull();
-    }
-
-#ifdef VBOX_WITH_VRDP
-    if (mVRDPServer)
-    {
-        mVRDPServer->uninit();
-        unconst(mVRDPServer).setNull();
-    }
-#endif
-
-    if (mBIOSSettings)
-    {
-        mBIOSSettings->uninit();
-        unconst(mBIOSSettings).setNull();
-    }
-
-    /* Deassociate hard disks (only when a real Machine or a SnapshotMachine
-     * instance is uninitialized; SessionMachine instances refer to real
-     * Machine hard disks). This is necessary for a clean re-initialization of
-     * the VM after successfully re-checking the accessibility state. Note
-     * that in case of normal Machine or SnapshotMachine uninitialization (as
-     * a result of unregistering or discarding the snapshot), outdated hard
-     * disk attachments will already be uninitialized and deleted, so this
-     * code will not affect them. */
-    if (!!mHDData && (mType == IsMachine || mType == IsSnapshotMachine))
-    {
-        for (HDData::AttachmentList::const_iterator it =
-                 mHDData->mAttachments.begin();
-             it != mHDData->mAttachments.end();
-             ++ it)
-        {
-            HRESULT rc = (*it)->hardDisk()->detachFrom (mData->mUuid,
-                                                        snapshotId());
-            AssertComRC (rc);
-        }
-    }
-
-    if (mType == IsMachine)
-    {
-        /* reset some important fields of mData */
-        mData->mCurrentSnapshot.setNull();
-        mData->mFirstSnapshot.setNull();
-    }
-
-    /* free data structures (the essential mData structure is not freed here
-     * since it may be still in use) */
-    mHDData.free();
-    mStorageControllers.free();
-    mHWData.free();
-    mUserData.free();
-    mSSData.free();
 }
 
@@ -4887 +4646 @@
 
     if (aSetError && !found)
-        setError (rc, tr ("Could not find a shared folder named '%ls'"), aName);
+        setError(rc, tr("Could not find a shared folder named '%ls'"), aName);
 
     return rc;
@@ -4903 +4662 @@
  *  @note Doesn't lock any objects.
  */
-HRESULT Machine::loadSettings (bool aRegistered)
+HRESULT Machine::loadSettings(bool aRegistered)
 {
     LogFlowThisFuncEnter();
@@ -4915 +4674 @@
     try
     {
-        using namespace settings;
-        using namespace xml;
-
-        /* no concurrent file access is possible in init() so open by handle */
-        File file (mData->mHandleCfgFile, Utf8Str (mData->mConfigFileFull));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_FirstTime (tree, file,
-                                                     mData->mSettingsFileVersion);
-        CheckComRCThrowRC (rc);
-
-        Key machineNode = tree.rootKey().key ("Machine");
-
-        /* uuid (required) */
-        Guid id = machineNode.value <Guid> ("uuid");
+        Assert(mData->m_pMachineConfigFile == NULL);
+
+        // load and parse machine XML; this will throw on XML or logic errors
+        mData->m_pMachineConfigFile = new settings::MachineConfigFile(&mData->m_strConfigFileFull);
 
         /* If the stored UUID is not empty, it means the registered machine
@@ -4936 +4684 @@
         if (!mData->mUuid.isEmpty())
         {
-            if (mData->mUuid != id)
+            if (mData->mUuid != mData->m_pMachineConfigFile->uuid)
             {
-                throw setError (E_FAIL,
-                    tr ("Machine UUID {%RTuuid} in '%ls' doesn't match its "
-                        "UUID {%s} in the registry file '%ls'"),
-                    id.raw(), mData->mConfigFileFull.raw(),
-                    mData->mUuid.toString().raw(),
-                    mParent->settingsFileName().raw());
+                throw setError(E_FAIL,
+                               tr("Machine UUID {%RTuuid} in '%s' doesn't match its UUID {%s} in the registry file '%s'"),
+                               mData->m_pMachineConfigFile->uuid.raw(),
+                               mData->m_strConfigFileFull.raw(),
+                               mData->mUuid.toString().raw(),
+                               mParent->settingsFilePath().raw());
             }
         }
         else
-            unconst(mData->mUuid) = id;
+            unconst (mData->mUuid) = mData->m_pMachineConfigFile->uuid;
 
         /* name (required) */
-        mUserData->mName = machineNode.stringValue ("name");
+        mUserData->mName = mData->m_pMachineConfigFile->strName;
 
         /* nameSync (optional, default is true) */
-        mUserData->mNameSync = machineNode.value <bool> ("nameSync");
-
-        /* Description (optional, default is null) */
-        {
-            Key descNode = machineNode.findKey ("Description");
-            if (!descNode.isNull())
-                mUserData->mDescription = descNode.keyStringValue();
-            else
-                mUserData->mDescription.setNull();
-        }
-
-        /* OSType (required) */
-        {
-            mUserData->mOSTypeId = machineNode.stringValue ("OSType");
-
-            /* look up the object by Id to check it is valid */
-            ComPtr<IGuestOSType> guestOSType;
-            rc = mParent->GetGuestOSType (mUserData->mOSTypeId,
-                                          guestOSType.asOutParam());
-            CheckComRCThrowRC (rc);
-        }
-
-        /* stateFile (optional) */
-        {
-            Bstr stateFilePath = machineNode.stringValue ("stateFile");
-            if (stateFilePath)
-            {
-                Utf8Str stateFilePathFull = stateFilePath;
-                int vrc = calculateFullPath (stateFilePathFull, stateFilePathFull);
-                if (RT_FAILURE(vrc))
-                {
-                    throw setError (E_FAIL,
-                        tr ("Invalid saved state file path '%ls' (%Rrc)"),
-                        stateFilePath.raw(), vrc);
-                }
-                mSSData->mStateFilePath = stateFilePathFull;
-            }
-            else
-                mSSData->mStateFilePath.setNull();
-        }
-
-        /*
-         *  currentSnapshot ID (optional)
-         *
-         *  Note that due to XML Schema constaraints, this attribute, when
-         *  present, will guaranteedly refer to an existing snapshot
-         *  definition in XML
-         */
-        Guid currentSnapshotId = machineNode.valueOr <Guid> ("currentSnapshot",
-                                                             Guid());
+        mUserData->mNameSync = mData->m_pMachineConfigFile->fNameSync;
+
+        mUserData->mDescription = mData->m_pMachineConfigFile->strDescription;
+
+        // guest OS type
+        mUserData->mOSTypeId = mData->m_pMachineConfigFile->strOsType;
+        /* look up the object by Id to check it is valid */
+        ComPtr<IGuestOSType> guestOSType;
+        rc = mParent->GetGuestOSType(mUserData->mOSTypeId,
+                                     guestOSType.asOutParam());
+        CheckComRCThrowRC(rc);
+
+        // stateFile (optional)
+        if (mData->m_pMachineConfigFile->strStateFile.isEmpty())
+            mSSData->mStateFilePath.setNull();
+        else
+        {
+            Utf8Str stateFilePathFull(mData->m_pMachineConfigFile->strStateFile);
+            int vrc = calculateFullPath(stateFilePathFull, stateFilePathFull);
+            if (RT_FAILURE(vrc))
+                throw setError(E_FAIL,
+                                tr("Invalid saved state file path '%s' (%Rrc)"),
+                                mData->m_pMachineConfigFile->strStateFile.raw(),
+                                vrc);
+            mSSData->mStateFilePath = stateFilePathFull;
+        }
 
         /* snapshotFolder (optional) */
-        {
-            Bstr folder = machineNode.stringValue ("snapshotFolder");
-            rc = COMSETTER (SnapshotFolder) (folder);
-            CheckComRCThrowRC (rc);
-        }
+        rc = COMSETTER(SnapshotFolder)(Bstr(mData->m_pMachineConfigFile->strSnapshotFolder));
+        CheckComRCThrowRC(rc);
 
         /* currentStateModified (optional, default is true) */
-        mData->mCurrentStateModified = machineNode.value <bool> ("currentStateModified");
-
-        /* lastStateChange (optional, defaults to now) */
-        {
-            RTTIMESPEC now;
-            RTTimeNow (&now);
-            mData->mLastStateChange =
-                machineNode.valueOr <RTTIMESPEC> ("lastStateChange", now);
-        }
-
-        /* aborted (optional, default is false) */
-        bool aborted = machineNode.value <bool> ("aborted");
+        mData->mCurrentStateModified = mData->m_pMachineConfigFile->fCurrentStateModified;
+
+        mData->mLastStateChange = mData->m_pMachineConfigFile->timeLastStateChange;
 
         /*
@@ -5033 +4745 @@
 
         /* Snapshot node (optional) */
-        {
-            Key snapshotNode = machineNode.findKey ("Snapshot");
-            if (!snapshotNode.isNull())
-            {
-                /* read all snapshots recursively */
-                rc = loadSnapshot (snapshotNode, currentSnapshotId, NULL);
-                CheckComRCThrowRC (rc);
-            }
-        }
-
-        Key hardwareNode = machineNode.key("Hardware");
+        if (mData->m_pMachineConfigFile->llFirstSnapshot.size())
+        {
+            // there can only be one root snapshot
+            Assert(mData->m_pMachineConfigFile->llFirstSnapshot.size() == 1);
+
+            settings::Snapshot &snap = mData->m_pMachineConfigFile->llFirstSnapshot.front();
+
+            rc = loadSnapshot(snap,
+                              mData->m_pMachineConfigFile->uuidCurrentSnapshot,
+                              NULL);        // no parent == first snapshot
+            CheckComRCThrowRC(rc);
+        }
 
         /* Hardware node (required) */
-        rc = loadHardware (hardwareNode);
-        CheckComRCThrowRC (rc);
+        rc = loadHardware(mData->m_pMachineConfigFile->hardwareMachine);
+        CheckComRCThrowRC(rc);
 
         /* Load storage controllers */
-        rc = loadStorageControllers (machineNode.key ("StorageControllers"), aRegistered);
-        CheckComRCThrowRC (rc);
+        rc = loadStorageControllers(mData->m_pMachineConfigFile->storageMachine, aRegistered);
+        CheckComRCThrowRC(rc);
 
         /*
@@ -5061 +4774 @@
 
         /* set the machine state to Aborted or Saved when appropriate */
-        if (aborted)
-        {
-            Assert (!mSSData->mStateFilePath);
+        if (mData->m_pMachineConfigFile->fAborted)
+        {
+            Assert(!mSSData->mStateFilePath);
             mSSData->mStateFilePath.setNull();
 
@@ -5096 +4809 @@
  *  @param aParentSnapshot  Parent snapshot.
  */
-HRESULT Machine::loadSnapshot (const settings::Key &aNode,
-                               const Guid &aCurSnapshotId,
-                               Snapshot *aParentSnapshot)
-{
-    using namespace settings;
-
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
-    AssertReturn(mType == IsMachine, E_FAIL);
+HRESULT Machine::loadSnapshot(const settings::Snapshot &data,
+                              const Guid &aCurSnapshotId,
+                              Snapshot *aParentSnapshot)
+{
+    AssertReturn (mType == IsMachine, E_FAIL);
+
+    HRESULT rc = S_OK;
+
+    Utf8Str strStateFile;
+    if (!data.strStateFile.isEmpty())
+    {
+        /* optional */
+        strStateFile = data.strStateFile;
+        int vrc = calculateFullPath(strStateFile, strStateFile);
+        if (RT_FAILURE(vrc))
+            return setError(E_FAIL,
+                            tr("Invalid saved state file path '%s' (%Rrc)"),
+                            strStateFile.raw(),
+                            vrc);
+    }
 
     /* create a snapshot machine object */
-    ComObjPtr<SnapshotMachine> snapshotMachine;
-    snapshotMachine.createObject();
-
-    HRESULT rc = S_OK;
-
-    /* required */
-    Guid uuid = aNode.value <Guid> ("uuid");
-
-    {
-        /* optional */
-        Bstr stateFilePath = aNode.stringValue ("stateFile");
-        if (stateFilePath)
-        {
-            Utf8Str stateFilePathFull = stateFilePath;
-            int vrc = calculateFullPath (stateFilePathFull, stateFilePathFull);
-            if (RT_FAILURE(vrc))
-                return setError (E_FAIL,
-                                 tr ("Invalid saved state file path '%ls' (%Rrc)"),
-                                 stateFilePath.raw(), vrc);
-
-            stateFilePath = stateFilePathFull;
-        }
-
-        /* Hardware node (required) */
-        Key hardwareNode = aNode.key ("Hardware");
-
-        /* StorageControllers node (required) */
-        Key storageNode = aNode.key ("StorageControllers");
-
-        /* initialize the snapshot machine */
-        rc = snapshotMachine->init (this, hardwareNode, storageNode,
-                                    uuid, stateFilePath);
-        CheckComRCReturnRC(rc);
-    }
+    ComObjPtr<SnapshotMachine> pSnapshotMachine;
+    pSnapshotMachine.createObject();
+    rc = pSnapshotMachine->init(this,
+                                data.hardware,
+                                data.storage,
+                                data.uuid,
+                                strStateFile);
+    CheckComRCReturnRC (rc);
 
     /* create a snapshot object */
-    ComObjPtr<Snapshot> snapshot;
-    snapshot.createObject();
-
-    {
-        /* required */
-        Bstr name = aNode.stringValue ("name");
-
-        /* required */
-        RTTIMESPEC timeStamp = aNode.value <RTTIMESPEC> ("timeStamp");
-
-        /* optional */
-        Bstr description;
-        {
-            Key descNode = aNode.findKey ("Description");
-            if (!descNode.isNull())
-                description = descNode.keyStringValue();
-        }
-
-        /* initialize the snapshot */
-        rc = snapshot->init(mParent, // VirtualBox object
-                            uuid,
-                            name,
-                            description,
-                            timeStamp,
-                            snapshotMachine,
-                            aParentSnapshot);
-        CheckComRCReturnRC(rc);
-    }
+    ComObjPtr<Snapshot> pSnapshot;
+    pSnapshot.createObject();
+    /* initialize the snapshot */
+    rc = pSnapshot->init(mParent, // VirtualBox object
+                         data.uuid,
+                         data.strName,
+                         data.strDescription,
+                         data.timestamp,
+                         pSnapshotMachine,
+                         aParentSnapshot);
+    CheckComRCReturnRC (rc);
 
     /* memorize the first snapshot if necessary */
     if (!mData->mFirstSnapshot)
-        mData->mFirstSnapshot = snapshot;
+        mData->mFirstSnapshot = pSnapshot;
 
     /* memorize the current snapshot when appropriate */
     if (    !mData->mCurrentSnapshot
-         && snapshot->getId() == aCurSnapshotId
+         && pSnapshot->getId() == aCurSnapshotId
        )
-        mData->mCurrentSnapshot = snapshot;
-
-    /* Snapshots node (optional) */
-    {
-        Key snapshotsNode = aNode.findKey ("Snapshots");
-        if (!snapshotsNode.isNull())
-        {
-            Key::List children = snapshotsNode.keys ("Snapshot");
-            for (Key::List::const_iterator it = children.begin();
-                 it != children.end(); ++ it)
-            {
-                rc = loadSnapshot ((*it), aCurSnapshotId, snapshot);
-                CheckComRCBreakRC (rc);
-            }
-        }
+        mData->mCurrentSnapshot = pSnapshot;
+
+    // now create the children
+    for (settings::SnapshotsList::const_iterator it = data.llChildSnapshots.begin();
+         it != data.llChildSnapshots.end();
+         ++it)
+    {
+        const settings::Snapshot &childData = *it;
+        // recurse
+        rc = loadSnapshot(childData,
+                          aCurSnapshotId,
+                          pSnapshot);       // parent = the one we created above
+        CheckComRCBreakRC(rc);
     }
 
@@ -5202 +4882 @@
  *  @param aNode    <Hardware> node.
  */
-HRESULT Machine::loadHardware (const settings::Key &aNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
+HRESULT Machine::loadHardware(const settings::Hardware &data)
+{
     AssertReturn(mType == IsMachine || mType == IsSnapshotMachine, E_FAIL);
 
     HRESULT rc = S_OK;
 
-    /* The hardware version attribute (optional). */
-    mHWData->mHWVersion = aNode.stringValue ("version");
-
-    /* CPU node (currently not required) */
-    {
-        /* default value in case the node is not there */
-        mHWData->mHWVirtExEnabled             = true;
-        mHWData->mHWVirtExNestedPagingEnabled = false;
-        mHWData->mHWVirtExVPIDEnabled         = false;
-        mHWData->mPAEEnabled                  = false;
-
-        Key cpuNode = aNode.findKey ("CPU");
-        if (!cpuNode.isNull())
-        {
-            Key hwVirtExNode = cpuNode.key ("HardwareVirtEx");
-            if (!hwVirtExNode.isNull())
-            {
-                const char *enabled = hwVirtExNode.stringValue ("enabled");
-                if      (strcmp (enabled, "true") == 0)
-                    mHWData->mHWVirtExEnabled = true;
-                else
-                    mHWData->mHWVirtExEnabled = false;
-            }
-            /* HardwareVirtExNestedPaging (optional, default is false) */
-            Key HWVirtExNestedPagingNode = cpuNode.findKey ("HardwareVirtExNestedPaging");
-            if (!HWVirtExNestedPagingNode.isNull())
-            {
-                mHWData->mHWVirtExNestedPagingEnabled = HWVirtExNestedPagingNode.value <bool> ("enabled");
-            }
-
-            /* HardwareVirtExVPID (optional, default is false) */
-            Key HWVirtExVPIDNode = cpuNode.findKey ("HardwareVirtExVPID");
-            if (!HWVirtExVPIDNode.isNull())
-            {
-                mHWData->mHWVirtExVPIDEnabled = HWVirtExVPIDNode.value <bool> ("enabled");
-            }
-
-            /* PAE (optional, default is false) */
-            Key PAENode = cpuNode.findKey ("PAE");
-            if (!PAENode.isNull())
-            {
-                mHWData->mPAEEnabled = PAENode.value <bool> ("enabled");
-            }
-
-            /* CPUCount (optional, default is 1) */
-            mHWData->mCPUCount = cpuNode.value <ULONG> ("count");
-        }
-    }
-
-    /* Memory node (required) */
-    {
-        Key memoryNode = aNode.key ("Memory");
-
-        mHWData->mMemorySize = memoryNode.value <ULONG> ("RAMSize");
-    }
-
-    /* Boot node (required) */
-    {
-        /* reset all boot order positions to NoDevice */
-        for (size_t i = 0; i < RT_ELEMENTS (mHWData->mBootOrder); i++)
-            mHWData->mBootOrder [i] = DeviceType_Null;
-
-        Key bootNode = aNode.key ("Boot");
-
-        Key::List orderNodes = bootNode.keys ("Order");
-        for (Key::List::const_iterator it = orderNodes.begin();
-             it != orderNodes.end(); ++ it)
-        {
-            /* position (required) */
-            /* position unicity is guaranteed by XML Schema */
-            uint32_t position = (*it).value <uint32_t> ("position");
-            -- position;
-            Assert (position < RT_ELEMENTS (mHWData->mBootOrder));
-
-            /* device (required) */
-            const char *device = (*it).stringValue ("device");
-            if      (strcmp (device, "None") == 0)
-                mHWData->mBootOrder [position] = DeviceType_Null;
-            else if (strcmp (device, "Floppy") == 0)
-                mHWData->mBootOrder [position] = DeviceType_Floppy;
-            else if (strcmp (device, "DVD") == 0)
-                mHWData->mBootOrder [position] = DeviceType_DVD;
-            else if (strcmp (device, "HardDisk") == 0)
-                mHWData->mBootOrder [position] = DeviceType_HardDisk;
-            else if (strcmp (device, "Network") == 0)
-                mHWData->mBootOrder [position] = DeviceType_Network;
+    try
+    {
+        /* The hardware version attribute (optional). */
+        mHWData->mHWVersion = data.strVersion;
+
+        mHWData->mHWVirtExEnabled             = data.fHardwareVirt;
+        mHWData->mHWVirtExNestedPagingEnabled = data.fNestedPaging;
+        mHWData->mHWVirtExVPIDEnabled         = data.fVPID;
+        mHWData->mPAEEnabled                  = data.fPAE;
+
+        mHWData->mCPUCount = data.cCPUs;
+
+        mHWData->mMemorySize = data.ulMemorySizeMB;
+
+        // boot order
+        for (size_t i = 0;
+             i < RT_ELEMENTS(mHWData->mBootOrder);
+             i++)
+        {
+            settings::BootOrderMap::const_iterator it = data.mapBootOrder.find(i);
+            if (it == data.mapBootOrder.end())
+                mHWData->mBootOrder[i] = DeviceType_Null;
             else
-                ComAssertMsgFailed (("Invalid device: %s", device));
-        }
-    }
-
-    /* Display node (required) */
-    {
-        Key displayNode = aNode.key ("Display");
-
-        mHWData->mVRAMSize      = displayNode.value <ULONG> ("VRAMSize");
-        mHWData->mMonitorCount  = displayNode.value <ULONG> ("monitorCount");
-        mHWData->mAccelerate3DEnabled = displayNode.value <bool> ("accelerate3D");
-        mHWData->mAccelerate2DVideoEnabled = displayNode.value <bool> ("accelerate2DVideo");
-    }
+                mHWData->mBootOrder[i] = it->second;
+        }
+
+        mHWData->mVRAMSize      = data.ulVRAMSizeMB;
+        mHWData->mMonitorCount  = data.cMonitors;
+        mHWData->mAccelerate3DEnabled = data.fAccelerate3D;
+        mHWData->mAccelerate2DVideoEnabled = data.fAccelerate2DVideo;
 
 #ifdef VBOX_WITH_VRDP
-    /* RemoteDisplay */
-    rc = mVRDPServer->loadSettings (aNode);
-    CheckComRCReturnRC(rc);
+        /* RemoteDisplay */
+        rc = mVRDPServer->loadSettings(data.vrdpSettings);
+        CheckComRCReturnRC (rc);
 #endif
 
-    /* BIOS */
-    rc = mBIOSSettings->loadSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* DVD drive */
-    rc = mDVDDrive->loadSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* Floppy drive */
-    rc = mFloppyDrive->loadSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* USB Controller */
-    rc = mUSBController->loadSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* Network node (required) */
-    {
-        /* we assume that all network adapters are initially disabled
-         * and detached */
-
-        Key networkNode = aNode.key ("Network");
-
-        rc = S_OK;
-
-        Key::List adapters = networkNode.keys ("Adapter");
-        for (Key::List::const_iterator it = adapters.begin();
-             it != adapters.end(); ++ it)
-        {
-            /* slot number (required) */
+        /* BIOS */
+        rc = mBIOSSettings->loadSettings(data.biosSettings);
+        CheckComRCReturnRC (rc);
+
+        /* DVD drive */
+        rc = mDVDDrive->loadSettings(data.dvdDrive);
+        CheckComRCReturnRC (rc);
+
+        /* Floppy drive */
+        rc = mFloppyDrive->loadSettings(data.floppyDrive);
+        CheckComRCReturnRC (rc);
+
+        /* USB Controller */
+        rc = mUSBController->loadSettings(data.usbController);
+        CheckComRCReturnRC (rc);
+
+        // network adapters
+        for (settings::NetworkAdaptersList::const_iterator it = data.llNetworkAdapters.begin();
+            it != data.llNetworkAdapters.end();
+            ++it)
+        {
+            const settings::NetworkAdapter &nic = *it;
+
             /* slot unicity is guaranteed by XML Schema */
-            uint32_t slot = (*it).value <uint32_t> ("slot");
-            AssertBreak (slot < RT_ELEMENTS (mNetworkAdapters));
-
-            rc = mNetworkAdapters [slot]->loadSettings (*it);
-            CheckComRCReturnRC(rc);
-        }
-    }
-
-    /* Serial node (required) */
-    {
-        Key serialNode = aNode.key ("UART");
-
-        rc = S_OK;
-
-        Key::List ports = serialNode.keys ("Port");
-        for (Key::List::const_iterator it = ports.begin();
-             it != ports.end(); ++ it)
-        {
-            /* slot number (required) */
-            /* slot unicity is guaranteed by XML Schema */
-            uint32_t slot = (*it).value <uint32_t> ("slot");
-            AssertBreak (slot < RT_ELEMENTS (mSerialPorts));
-
-            rc = mSerialPorts [slot]->loadSettings (*it);
-            CheckComRCReturnRC(rc);
-        }
-    }
-
-    /* Parallel node (optional) */
-    {
-        Key parallelNode = aNode.key ("LPT");
-
-        rc = S_OK;
-
-        Key::List ports = parallelNode.keys ("Port");
-        for (Key::List::const_iterator it = ports.begin();
-             it != ports.end(); ++ it)
-        {
-            /* slot number (required) */
-            /* slot unicity is guaranteed by XML Schema */
-            uint32_t slot = (*it).value <uint32_t> ("slot");
-            AssertBreak (slot < RT_ELEMENTS (mSerialPorts));
-
-            rc = mParallelPorts [slot]->loadSettings (*it);
-            CheckComRCReturnRC(rc);
-        }
-    }
-
-    /* AudioAdapter */
-    rc = mAudioAdapter->loadSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* Shared folders (required) */
-    {
-        Key sharedFoldersNode = aNode.key ("SharedFolders");
-
-        rc = S_OK;
-
-        Key::List folders = sharedFoldersNode.keys ("SharedFolder");
-        for (Key::List::const_iterator it = folders.begin();
-             it != folders.end(); ++ it)
-        {
-            /* folder logical name (required) */
-            Bstr name = (*it).stringValue ("name");
-            /* folder host path (required) */
-            Bstr hostPath = (*it).stringValue ("hostPath");
-
-            bool writable = (*it).value <bool> ("writable");
-
-            rc = CreateSharedFolder (name, hostPath, writable);
-            CheckComRCReturnRC(rc);
-        }
-    }
-
-    /* Clipboard node (required) */
-    {
-        Key clipNode = aNode.key ("Clipboard");
-
-        const char *mode = clipNode.stringValue ("mode");
-        if      (strcmp (mode, "Disabled") == 0)
-            mHWData->mClipboardMode = ClipboardMode_Disabled;
-        else if (strcmp (mode, "HostToGuest") == 0)
-            mHWData->mClipboardMode = ClipboardMode_HostToGuest;
-        else if (strcmp (mode, "GuestToHost") == 0)
-            mHWData->mClipboardMode = ClipboardMode_GuestToHost;
-        else if (strcmp (mode, "Bidirectional") == 0)
-            mHWData->mClipboardMode = ClipboardMode_Bidirectional;
-        else
-            AssertMsgFailed (("Invalid clipboard mode '%s'\n", mode));
-    }
-
-    /* Guest node (required) */
-    {
-        Key guestNode = aNode.key ("Guest");
-
-        /* optional, defaults to 0 */
-        mHWData->mMemoryBalloonSize =
-            guestNode.value <ULONG> ("memoryBalloonSize");
-        /* optional, defaults to 0 */
-        mHWData->mStatisticsUpdateInterval =
-            guestNode.value <ULONG> ("statisticsUpdateInterval");
-    }
+            AssertBreak(nic.ulSlot < RT_ELEMENTS(mNetworkAdapters));
+            rc = mNetworkAdapters[nic.ulSlot]->loadSettings(nic);
+            CheckComRCReturnRC (rc);
+        }
+
+        // serial ports
+        for (settings::SerialPortsList::const_iterator it = data.llSerialPorts.begin();
+            it != data.llSerialPorts.end();
+            ++it)
+        {
+            const settings::SerialPort &s = *it;
+
+            AssertBreak(s.ulSlot < RT_ELEMENTS(mSerialPorts));
+            rc = mSerialPorts[s.ulSlot]->loadSettings(s);
+            CheckComRCReturnRC (rc);
+        }
+
+        // parallel ports (optional)
+        for (settings::ParallelPortsList::const_iterator it = data.llParallelPorts.begin();
+            it != data.llParallelPorts.end();
+            ++it)
+        {
+            const settings::ParallelPort &p = *it;
+
+            AssertBreak(p.ulSlot < RT_ELEMENTS(mParallelPorts));
+            rc = mParallelPorts[p.ulSlot]->loadSettings(p);
+            CheckComRCReturnRC (rc);
+        }
+
+        /* AudioAdapter */
+        rc = mAudioAdapter->loadSettings(data.audioAdapter);
+        CheckComRCReturnRC (rc);
+
+        for (settings::SharedFoldersList::const_iterator it = data.llSharedFolders.begin();
+             it != data.llSharedFolders.end();
+             ++it)
+        {
+            const settings::SharedFolder &sf = *it;
+            rc = CreateSharedFolder(Bstr(sf.strName), Bstr(sf.strHostPath), sf.fWritable);
+            CheckComRCReturnRC (rc);
+        }
+
+        // Clipboard
+        mHWData->mClipboardMode = data.clipboardMode;
+
+        // guest settings
+        mHWData->mMemoryBalloonSize = data.ulMemoryBalloonSize;
+        mHWData->mStatisticsUpdateInterval = data.ulStatisticsUpdateInterval;
 
 #ifdef VBOX_WITH_GUEST_PROPS
-    /* Guest properties (optional) */
-    try
-    {
-        using namespace guestProp;
-
-        Key guestPropertiesNode = aNode.findKey ("GuestProperties");
-        Bstr notificationPatterns ("");  /* We catch allocation failure below. */
-        if (!guestPropertiesNode.isNull())
-        {
-            Key::List properties = guestPropertiesNode.keys ("GuestProperty");
-            for (Key::List::const_iterator it = properties.begin();
-                 it != properties.end(); ++ it)
-            {
-                uint32_t fFlags = NILFLAG;
-
-                /* property name (required) */
-                Bstr name = (*it).stringValue ("name");
-                /* property value (required) */
-                Bstr value = (*it).stringValue ("value");
-                /* property timestamp (optional, defaults to 0) */
-                ULONG64 timestamp = (*it).value<ULONG64> ("timestamp");
-                /* property flags (optional, defaults to empty) */
-                Bstr flags = (*it).stringValue ("flags");
-                Utf8Str utf8Flags(flags);
-                validateFlags (utf8Flags.raw(), &fFlags);
-                HWData::GuestProperty property = { name, value, timestamp, fFlags };
-                mHWData->mGuestProperties.push_back (property);
-                /* This is just sanity, as the push_back() will probably have thrown
-                 * an exception if we are out of memory.  Note that if we run out
-                 * allocating the Bstrs above, this will be caught here as well. */
-                if (   mHWData->mGuestProperties.back().mName.isNull ()
-                    || mHWData->mGuestProperties.back().mValue.isNull ()
-                   )
-                    return E_OUTOFMEMORY;
-            }
-            notificationPatterns = guestPropertiesNode.stringValue ("notificationPatterns");
-        }
+        /* Guest properties (optional) */
+        for (settings::GuestPropertiesList::const_iterator it = data.llGuestProperties.begin();
+            it != data.llGuestProperties.end();
+            ++it)
+        {
+            const settings::GuestProperty &prop = *it;
+            uint32_t fFlags = guestProp::NILFLAG;
+            guestProp::validateFlags(prop.strFlags.c_str(), &fFlags);
+            HWData::GuestProperty property = { prop.strName, prop.strValue, prop.timestamp, fFlags };
+            mHWData->mGuestProperties.push_back(property);
+        }
+
         mHWData->mPropertyServiceActive = false;
-        mHWData->mGuestPropertyNotificationPatterns = notificationPatterns;
-        if (mHWData->mGuestPropertyNotificationPatterns.isNull ())
-            return E_OUTOFMEMORY;
+        mHWData->mGuestPropertyNotificationPatterns = data.strNotificationPatterns;
+#endif /* VBOX_WITH_GUEST_PROPS defined */
     }
     catch(std::bad_alloc &e)
@@ -5499 +5019 @@
         return E_OUTOFMEMORY;
     }
-#endif /* VBOX_WITH_GUEST_PROPS defined */
-
-    AssertComRC (rc);
+
+    AssertComRC(rc);
     return rc;
 }
 
-/**
- *  @param aNode    <StorageControllers> node.
- */
-HRESULT Machine::loadStorageControllers (const settings::Key &aNode, bool aRegistered,
-                                         const Guid *aSnapshotId /* = NULL */)
-{
-    using namespace settings;
-
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
-    AssertReturn(mType == IsMachine || mType == IsSnapshotMachine, E_FAIL);
+  /**
+   *  @param aNode    <StorageControllers> node.
+   */
+HRESULT Machine::loadStorageControllers(const settings::Storage &data,
+                                        bool aRegistered,
+                                        const Guid *aSnapshotId /* = NULL */)
+{
+    AssertReturn (mType == IsMachine || mType == IsSnapshotMachine, E_FAIL);
 
     HRESULT rc = S_OK;
-
-    Key::List children = aNode.keys ("StorageController");
 
     /* Make sure the attached hard disks don't get unregistered until we
      * associate them with tis machine (important for VMs loaded (opened) after
      * VirtualBox startup) */
-    AutoReadLock vboxLock (mParent);
-
-    for (Key::List::const_iterator it = children.begin();
-         it != children.end(); ++ it)
-    {
-        Bstr controllerName = (*it).stringValue ("name");
-        const char *controllerType = (*it).stringValue ("type");
-        ULONG portCount = (*it).value <ULONG> ("PortCount");
-        StorageControllerType_T controller;
-        StorageBus_T connection;
-
-        if (strcmp (controllerType, "AHCI") == 0)
-        {
-            connection = StorageBus_SATA;
-            controller = StorageControllerType_IntelAhci;
-        }
-        else if (strcmp (controllerType, "LsiLogic") == 0)
-        {
-            connection = StorageBus_SCSI;
-            controller = StorageControllerType_LsiLogic;
-        }
-        else if (strcmp (controllerType, "BusLogic") == 0)
-        {
-            connection = StorageBus_SCSI;
-            controller = StorageControllerType_BusLogic;
-        }
-        else if (strcmp (controllerType, "PIIX3") == 0)
-        {
-            connection = StorageBus_IDE;
-            controller = StorageControllerType_PIIX3;
-        }
-        else if (strcmp (controllerType, "PIIX4") == 0)
-        {
-            connection = StorageBus_IDE;
-            controller = StorageControllerType_PIIX4;
-        }
-        else if (strcmp (controllerType, "ICH6") == 0)
-        {
-            connection = StorageBus_IDE;
-            controller = StorageControllerType_ICH6;
-        }
-        else
-            AssertFailedReturn (E_FAIL);
-
-        ComObjPtr<StorageController> ctl;
+    AutoReadLock vboxLock(mParent);
+
+    for (settings::StorageControllersList::const_iterator it = data.llStorageControllers.begin();
+         it != data.llStorageControllers.end();
+         ++it)
+    {
+        const settings::StorageController &ctlData = *it;
+
+        ComObjPtr<StorageController> pCtl;
         /* Try to find one with the name first. */
-        rc = getStorageControllerByName (controllerName, ctl, false /* aSetError */);
+        rc = getStorageControllerByName(ctlData.strName, pCtl, false /* aSetError */);
         if (SUCCEEDED(rc))
-            return setError (VBOX_E_OBJECT_IN_USE,
-                tr ("Storage controller named '%ls' already exists"), controllerName.raw());
-
-        ctl.createObject();
-        rc = ctl->init (this, controllerName, connection);
-        CheckComRCReturnRC(rc);
-
-        mStorageControllers->push_back (ctl);
-
-        rc = ctl->COMSETTER(ControllerType)(controller);
-        CheckComRCReturnRC(rc);
-
-        rc = ctl->COMSETTER(PortCount)(portCount);
-        CheckComRCReturnRC(rc);
+            return setError(VBOX_E_OBJECT_IN_USE,
+                            tr("Storage controller named '%s' already exists"),
+                            ctlData.strName.raw());
+
+        pCtl.createObject();
+        rc = pCtl->init(this,
+                        ctlData.strName,
+                        ctlData.storageBus);
+        CheckComRCReturnRC (rc);
+
+        mStorageControllers->push_back(pCtl);
+
+        rc = pCtl->COMSETTER(ControllerType)(ctlData.controllerType);
+        CheckComRCReturnRC (rc);
+
+        rc = pCtl->COMSETTER(PortCount)(ctlData.ulPortCount);
+        CheckComRCReturnRC (rc);
 
         /* Set IDE emulation settings (only for AHCI controller). */
-        if (controller == StorageControllerType_IntelAhci)
-        {
-            ULONG val;
-
-            /* ide emulation settings (optional, default to 0,1,2,3 respectively) */
-            val = (*it).valueOr <ULONG> ("IDE0MasterEmulationPort", 0);
-            rc = ctl->SetIDEEmulationPort(0, val);
-            CheckComRCReturnRC(rc);
-            val = (*it).valueOr <ULONG> ("IDE0SlaveEmulationPort", 1);
-            rc = ctl->SetIDEEmulationPort(1, val);
-            CheckComRCReturnRC(rc);
-            val = (*it).valueOr <ULONG> ("IDE1MasterEmulationPort", 2);
-            rc = ctl->SetIDEEmulationPort(2, val);
-            CheckComRCReturnRC(rc);
-            val = (*it).valueOr <ULONG> ("IDE1SlaveEmulationPort", 3);
-            rc = ctl->SetIDEEmulationPort(3, val);
-            CheckComRCReturnRC(rc);
+        if (ctlData.controllerType == StorageControllerType_IntelAhci)
+        {
+            if (    (FAILED(rc = pCtl->SetIDEEmulationPort(0, ctlData.lIDE0MasterEmulationPort)))
+                 || (FAILED(rc = pCtl->SetIDEEmulationPort(1, ctlData.lIDE0SlaveEmulationPort)))
+                 || (FAILED(rc = pCtl->SetIDEEmulationPort(2, ctlData.lIDE1MasterEmulationPort)))
+                 || (FAILED(rc = pCtl->SetIDEEmulationPort(3, ctlData.lIDE1SlaveEmulationPort)))
+               )
+                return rc;
         }
 
         /* Load the attached devices now. */
-        rc = loadStorageDevices(ctl, (*it),
-                                aRegistered, aSnapshotId);
-        CheckComRCReturnRC(rc);
+        rc = loadStorageDevices(pCtl, ctlData,
+                                aRegistered,
+                                aSnapshotId);
+        CheckComRCReturnRC (rc);
     }
 
@@ -5624 +5098 @@
  * @note Lock mParent for reading and hard disks for writing before calling.
  */
-HRESULT Machine::loadStorageDevices (ComObjPtr<StorageController> aStorageController,
-                                     const settings::Key &aNode, bool aRegistered,
-                                     const Guid *aSnapshotId /* = NULL */)
-{
-    using namespace settings;
-
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
-    AssertReturn((mType == IsMachine && aSnapshotId == NULL) ||
+HRESULT Machine::loadStorageDevices(StorageController *aStorageController,
+                                    const settings::StorageController &data,
+                                    bool aRegistered,
+                                    const Guid *aSnapshotId /*= NULL*/)
+{
+    AssertReturn ((mType == IsMachine && aSnapshotId == NULL) ||
                   (mType == IsSnapshotMachine && aSnapshotId != NULL), E_FAIL);
 
     HRESULT rc = S_OK;
 
-    Key::List children = aNode.keys ("AttachedDevice");
-
-    if (!aRegistered && children.size() > 0)
-    {
+    if (!aRegistered && data.llAttachedDevices.size() > 0)
         /* when the machine is being loaded (opened) from a file, it cannot
          * have hard disks attached (this should not happen normally,
          * because we don't allow to attach hard disks to an unregistered
          * VM at all */
-        return setError (E_FAIL,
-            tr ("Unregistered machine '%ls' cannot have hard disks attached "
-                "(found %d hard disk attachments)"),
-            mUserData->mName.raw(), children.size());
-    }
-
-    for (Key::List::const_iterator it = children.begin();
-         it != children.end(); ++ it)
-    {
-        Key idKey = (*it).key ("Image");
-        /* hard disk uuid (required) */
-        Guid uuid = idKey.value <Guid> ("uuid");
-        /* device type (required) */
-        const char *deviceType = (*it).stringValue ("type");
-        /* channel (required) */
-        LONG port = (*it).value <LONG> ("port");
-        /* device (required) */
-        LONG device = (*it).value <LONG> ("device");
-
-        /* We support only hard disk types at the moment.
-         * @todo: Implement support for CD/DVD drives.
-         */
-        if (strcmp(deviceType, "HardDisk") != 0)
-            return setError (E_FAIL,
-                tr ("Device at position %lu:%lu is not a hard disk: %s"),
-                port, device, deviceType);
+        return setError(E_FAIL,
+                        tr("Unregistered machine '%ls' cannot have hard disks attached (found %d hard disk attachments)"),
+                        mUserData->mName.raw(),
+                        data.llAttachedDevices.size());
+
+    for (settings::AttachedDevicesList::const_iterator it = data.llAttachedDevices.begin();
+         it != data.llAttachedDevices.end();
+         ++it)
+    {
+        const settings::AttachedDevice &dev = *it;
 
         /* find a hard disk by UUID */
-        ComObjPtr<HardDisk> hd;
-        rc = mParent->findHardDisk(&uuid, NULL, true /* aDoSetError */, &hd);
-        CheckComRCReturnRC(rc);
-
-        AutoWriteLock hdLock (hd);
-
-        if (hd->type() == HardDiskType_Immutable)
+        ComObjPtr<HardDisk> pDisk;
+        rc = mParent->findHardDisk(&dev.uuid, NULL, true /* aDoSetError */, &pDisk);
+        CheckComRCReturnRC (rc);
+
+        AutoWriteLock hdLock(pDisk);
+
+        if (pDisk->type() == HardDiskType_Immutable)
         {
             if (mType == IsSnapshotMachine)
-                return setError (E_FAIL,
-                    tr ("Immutable hard disk '%ls' with UUID {%RTuuid} cannot be "
-                        "directly attached to snapshot with UUID {%RTuuid} "
-                        "of the virtual machine '%ls' ('%ls')"),
-                    hd->locationFull().raw(), uuid.raw(),
-                    aSnapshotId->raw(),
-                    mUserData->mName.raw(), mData->mConfigFileFull.raw());
-
-            return setError (E_FAIL,
-                tr ("Immutable hard disk '%ls' with UUID {%RTuuid} cannot be "
-                    "directly attached to the virtual machine '%ls' ('%ls')"),
-                hd->locationFull().raw(), uuid.raw(),
-                mUserData->mName.raw(), mData->mConfigFileFull.raw());
-        }
-
-        if (mType != IsSnapshotMachine && hd->children().size() != 0)
-            return setError (E_FAIL,
-                tr ("Hard disk '%ls' with UUID {%RTuuid} cannot be directly "
-                    "attached to the virtual machine '%ls' ('%ls') "
-                    "because it has %d differencing child hard disks"),
-                hd->locationFull().raw(), uuid.raw(),
-                mUserData->mName.raw(), mData->mConfigFileFull.raw(),
-                hd->children().size());
-
-        if (std::find_if (mHDData->mAttachments.begin(),
-                          mHDData->mAttachments.end(),
-                          HardDiskAttachment::RefersTo (hd)) !=
-                mHDData->mAttachments.end())
-        {
-            return setError (E_FAIL,
-                tr ("Hard disk '%ls' with UUID {%RTuuid} is already attached "
-                    "to the virtual machine '%ls' ('%ls')"),
-                hd->locationFull().raw(), uuid.raw(),
-                mUserData->mName.raw(), mData->mConfigFileFull.raw());
+                return setError(E_FAIL,
+                                tr("Immutable hard disk '%ls' with UUID {%RTuuid} cannot be directly attached to snapshot with UUID {%RTuuid} "
+                                   "of the virtual machine '%ls' ('%s')"),
+                                pDisk->locationFull().raw(),
+                                dev.uuid.raw(),
+                                aSnapshotId->raw(),
+                                mUserData->mName.raw(),
+                                mData->m_strConfigFileFull.raw());
+
+            return setError(E_FAIL,
+                            tr("Immutable hard disk '%ls' with UUID {%RTuuid} cannot be directly attached to the virtual machine '%ls' ('%s')"),
+                            pDisk->locationFull().raw(),
+                            dev.uuid.raw(),
+                            mUserData->mName.raw(),
+                            mData->m_strConfigFileFull.raw());
+        }
+
+        if (    mType != IsSnapshotMachine
+             && pDisk->children().size() != 0
+           )
+            return setError(E_FAIL,
+                            tr("Hard disk '%ls' with UUID {%RTuuid} cannot be directly attached to the virtual machine '%ls' ('%s') "
+                               "because it has %d differencing child hard disks"),
+                            pDisk->locationFull().raw(),
+                            dev.uuid.raw(),
+                            mUserData->mName.raw(),
+                            mData->m_strConfigFileFull.raw(),
+                            pDisk->children().size());
+
+        if (std::find_if(mHDData->mAttachments.begin(),
+                         mHDData->mAttachments.end(),
+                         HardDiskAttachment::RefersTo(pDisk))
+            != mHDData->mAttachments.end())
+        {
+            return setError(E_FAIL,
+                            tr("Hard disk '%ls' with UUID {%RTuuid} is already attached to the virtual machine '%ls' ('%s')"),
+                            pDisk->locationFull().raw(),
+                            dev.uuid.raw(),
+                            mUserData->mName.raw(),
+                            mData->m_strConfigFileFull.raw());
         }
 
         const Bstr controllerName = aStorageController->name();
-        ComObjPtr<HardDiskAttachment> attachment;
-        attachment.createObject();
-        rc = attachment->init (hd, controllerName, port, device);
-        CheckComRCBreakRC (rc);
+        ComObjPtr<HardDiskAttachment> pAttachment;
+        pAttachment.createObject();
+        rc = pAttachment->init(pDisk,
+                               controllerName,
+                               dev.lPort,
+                               dev.lDevice);
+        CheckComRCBreakRC(rc);
 
         /* associate the hard disk with this machine and snapshot */
         if (mType == IsSnapshotMachine)
-            rc = hd->attachTo (mData->mUuid, *aSnapshotId);
+            rc = pDisk->attachTo(mData->mUuid, *aSnapshotId);
         else
-            rc = hd->attachTo (mData->mUuid);
+            rc = pDisk->attachTo(mData->mUuid);
 
         AssertComRCBreakRC (rc);
@@ -5735 +5197 @@
 
         mHDData.backup();
-        mHDData->mAttachments.push_back (attachment);
+        mHDData->mAttachments.push_back(pAttachment);
     }
 
@@ -5742 +5204 @@
 
 /**
- *  Searches for a <Snapshot> node for the given snapshot.
- *  If the search is successful, \a aSnapshotNode will contain the found node.
- *  In this case, \a aSnapshotsNode can be NULL meaning the found node is a
- *  direct child of \a aMachineNode.
- *
- *  If the search fails, a failure is returned and both \a aSnapshotsNode and
- *  \a aSnapshotNode are set to 0.
- *
- *  @param aSnapshot        Snapshot to search for.
- *  @param aMachineNode     <Machine> node to start from.
- *  @param aSnapshotsNode   <Snapshots> node containing the found <Snapshot> node
- *                          (may be NULL if the caller is not interested).
- *  @param aSnapshotNode    Found <Snapshot> node.
- */
-HRESULT Machine::findSnapshotNode (Snapshot *aSnapshot, settings::Key &aMachineNode,
-                                   settings::Key *aSnapshotsNode,
-                                   settings::Key *aSnapshotNode)
-{
-    using namespace settings;
-
-    AssertReturn(aSnapshot && !aMachineNode.isNull()
-                  && aSnapshotNode != NULL, E_FAIL);
-
-    if (aSnapshotsNode)
-        aSnapshotsNode->setNull();
-    aSnapshotNode->setNull();
-
-    // build the full uuid path (from the top parent to the given snapshot)
-    std::list<Guid> path;
-    {
-        ComObjPtr<Snapshot> parent = aSnapshot;
-        while (parent)
-        {
-            path.push_front(parent->getId());
-            parent = parent->parent();
-        }
-    }
-
-    Key snapshotsNode = aMachineNode;
-    Key snapshotNode;
-
-    for (std::list <Guid>::const_iterator it = path.begin();
-         it != path.end();
-         ++ it)
-    {
-        if (!snapshotNode.isNull())
-        {
-            /* proceed to the nested <Snapshots> node */
-            snapshotsNode = snapshotNode.key ("Snapshots");
-            snapshotNode.setNull();
-        }
-
-        AssertReturn(!snapshotsNode.isNull(), E_FAIL);
-
-        Key::List children = snapshotsNode.keys ("Snapshot");
-        for (Key::List::const_iterator ch = children.begin();
-             ch != children.end();
-             ++ ch)
-        {
-            Guid id = (*ch).value <Guid> ("uuid");
-            if (id == (*it))
-            {
-                /* pass over to the outer loop */
-                snapshotNode = *ch;
-                break;
-            }
-        }
-
-        if (!snapshotNode.isNull())
-            continue;
-
-        /* the next uuid is not found, no need to continue... */
-        AssertFailedBreak();
-    }
-
-    // we must always succesfully find the node
-    AssertReturn(!snapshotNode.isNull(), E_FAIL);
-    AssertReturn(!snapshotsNode.isNull(), E_FAIL);
-
-    if (aSnapshotsNode && (snapshotsNode != aMachineNode))
-        *aSnapshotsNode = snapshotsNode;
-    *aSnapshotNode = snapshotNode;
-
-    return S_OK;
-}
-
-/**
- *  Returns the snapshot with the given UUID or fails of no such snapshot.
+ *  Returns the snapshot with the given UUID or fails of no such snapshot exists.
  *
  *  @param aId          snapshot UUID to find (empty UUID refers the first snapshot)
@@ -5844 +5219 @@
     {
         if (aSetError)
-            return setError (E_FAIL,
-                tr ("This machine does not have any snapshots"));
+            return setError(E_FAIL,
+                            tr("This machine does not have any snapshots"));
         return E_FAIL;
     }
@@ -5852 +5227 @@
         aSnapshot = mData->mFirstSnapshot;
     else
-        aSnapshot = mData->mFirstSnapshot->findChildOrSelf (aId);
+        aSnapshot = mData->mFirstSnapshot->findChildOrSelf(aId);
 
     if (!aSnapshot)
     {
         if (aSetError)
-            return setError (E_FAIL,
-                tr ("Could not find a snapshot with UUID {%s}"),
-                aId.toString().raw());
+            return setError(E_FAIL,
+                            tr("Could not find a snapshot with UUID {%s}"),
+                            aId.toString().raw());
         return E_FAIL;
     }
@@ -5884 +5259 @@
     {
         if (aSetError)
-            return setError (VBOX_E_OBJECT_NOT_FOUND,
-                tr ("This machine does not have any snapshots"));
+            return setError(VBOX_E_OBJECT_NOT_FOUND,
+                            tr("This machine does not have any snapshots"));
         return VBOX_E_OBJECT_NOT_FOUND;
     }
@@ -5894 +5269 @@
     {
         if (aSetError)
-            return setError (VBOX_E_OBJECT_NOT_FOUND,
-                tr ("Could not find a snapshot named '%ls'"), aName);
+            return setError(VBOX_E_OBJECT_NOT_FOUND,
+                            tr("Could not find a snapshot named '%ls'"), aName);
         return VBOX_E_OBJECT_NOT_FOUND;
     }
@@ -5909 +5284 @@
  *  @param aSetError             true to set extended error info on failure
  */
-HRESULT Machine::getStorageControllerByName(CBSTR aName,
+HRESULT Machine::getStorageControllerByName(const Utf8Str &aName,
                                             ComObjPtr<StorageController> &aStorageController,
                                             bool aSetError /* = false */)
 {
-    AssertReturn(aName, E_INVALIDARG);
-
-    for (StorageControllerList::const_iterator it =
-                mStorageControllers->begin();
-            it != mStorageControllers->end();
-            ++ it)
+    AssertReturn (!aName.isEmpty(), E_INVALIDARG);
+
+    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+         it != mStorageControllers->end();
+         ++it)
     {
         if ((*it)->name() == aName)
@@ -5928 +5302 @@
 
     if (aSetError)
-        return setError (VBOX_E_OBJECT_NOT_FOUND,
-            tr ("Could not find a storage controller named '%ls'"), aName);
+        return setError(VBOX_E_OBJECT_NOT_FOUND,
+                        tr("Could not find a storage controller named '%s'"),
+                        aName.raw());
     return VBOX_E_OBJECT_NOT_FOUND;
 }
@@ -5963 +5338 @@
  *  @param aNew     receives |true| if a virgin settings file was created.
  */
-HRESULT Machine::prepareSaveSettings (bool &aRenamed, bool &aNew)
+HRESULT Machine::prepareSaveSettings(bool &aRenamed,
+                                     bool &aNew)
 {
     /* Note: tecnhically, mParent needs to be locked only when the machine is
@@ -5978 +5354 @@
     /* if we're ready and isConfigLocked() is FALSE then it means
      * that no config file exists yet (we will create a virgin one) */
-    aNew = !isConfigLocked();
+    aNew = !mData->m_pMachineConfigFile->fileExists();
 
     /* attempt to rename the settings file if machine name is changed */
-    if (mUserData->mNameSync &&
-        mUserData.isBackedUp() &&
-        mUserData.backedUpData()->mName != mUserData->mName)
+    if (    mUserData->mNameSync
+         && mUserData.isBackedUp()
+         && mUserData.backedUpData()->mName != mUserData->mName
+       )
     {
         aRenamed = true;
-
-        if (!aNew)
-        {
-            /* unlock the old config file */
-            rc = unlockConfig();
-            CheckComRCReturnRC(rc);
-        }
 
         bool dirRenamed = false;
@@ -6007 +5377 @@
             Utf8Str newName = mUserData->mName;
 
-            configFile = mData->mConfigFileFull;
+            configFile = mData->m_strConfigFileFull;
 
             /* first, rename the directory if it matches the machine name */
@@ -6013 +5383 @@
             configDir.stripFilename();
             newConfigDir = configDir;
-            if (RTPathFilename(configDir) == name)
+            if (!strcmp(RTPathFilename(configDir.c_str()), name.c_str()))
             {
                 newConfigDir.stripFilename();
@@ -6027 +5397 @@
                     if (RT_FAILURE(vrc))
                     {
-                        rc = setError (E_FAIL,
-                            tr ("Could not rename the directory '%s' to '%s' "
-                                "to save the settings file (%Rrc)"),
-                            configDir.raw(), newConfigDir.raw(), vrc);
+                        rc = setError(E_FAIL,
+                                      tr("Could not rename the directory '%s' to '%s' to save the settings file (%Rrc)"),
+                                      configDir.raw(),
+                                      newConfigDir.raw(),
+                                      vrc);
                         break;
                     }
@@ -6044 +5415 @@
             {
                 /* get the path to old settings file in renamed directory */
-                configFile = Utf8StrFmt ("%s%c%s",
-                        newConfigDir.raw(), RTPATH_DELIMITER,
-                        RTPathFilename (configFile));
+                configFile = Utf8StrFmt("%s%c%s",
+                                        newConfigDir.raw(),
+                                        RTPATH_DELIMITER,
+                                        RTPathFilename(configFile.c_str()));
                 if (!aNew)
                 {
@@ -6053 +5425 @@
                     if (RT_FAILURE(vrc))
                     {
-                        rc = setError (E_FAIL,
-                            tr ("Could not rename the settings file '%s' to '%s' "
-                                "(%Rrc)"),
-                            configFile.raw(), newConfigFile.raw(), vrc);
+                        rc = setError(E_FAIL,
+                                      tr("Could not rename the settings file '%s' to '%s' (%Rrc)"),
+                                      configFile.raw(),
+                                      newConfigFile.raw(),
+                                      vrc);
                         break;
                     }
@@ -6064 +5437 @@
 
             /* update mConfigFileFull amd mConfigFile */
-            Bstr oldConfigFileFull = mData->mConfigFileFull;
-            Bstr oldConfigFile = mData->mConfigFile;
-            mData->mConfigFileFull = newConfigFile;
+            Utf8Str oldConfigFileFull = mData->m_strConfigFileFull;
+            Utf8Str oldConfigFile = mData->m_strConfigFile;
+            mData->m_strConfigFileFull = newConfigFile;
             /* try to get the relative path for mConfigFile */
             Utf8Str path = newConfigFile;
             mParent->calculateRelativePath (path, path);
-            mData->mConfigFile = path;
+            mData->m_strConfigFile = path;
 
             /* last, try to update the global settings with the new path */
             if (mData->mRegistered)
             {
-                rc = mParent->updateSettings (configDir, newConfigDir);
-                if (FAILED (rc))
+                rc = mParent->updateSettings(configDir.c_str(), newConfigDir.c_str());
+                if (FAILED(rc))
                 {
                     /* revert to old values */
-                    mData->mConfigFileFull = oldConfigFileFull;
-                    mData->mConfigFile = oldConfigFile;
+                    mData->m_strConfigFileFull = oldConfigFileFull;
+                    mData->m_strConfigFile = oldConfigFile;
                     break;
                 }
@@ -6087 +5460 @@
             /* update the snapshot folder */
             path = mUserData->mSnapshotFolderFull;
-            if (RTPathStartsWith (path, configDir))
+            if (RTPathStartsWith(path.c_str(), configDir.c_str()))
             {
-                path = Utf8StrFmt ("%s%s", newConfigDir.raw(),
-                                   path.raw() + configDir.length());
+                path = Utf8StrFmt("%s%s", newConfigDir.raw(),
+                                  path.raw() + configDir.length());
                 mUserData->mSnapshotFolderFull = path;
                 calculateRelativePath (path, path);
@@ -6098 +5471 @@
             /* update the saved state file path */
             path = mSSData->mStateFilePath;
-            if (RTPathStartsWith (path, configDir))
+            if (RTPathStartsWith(path.c_str(), configDir.c_str()))
             {
-                path = Utf8StrFmt ("%s%s", newConfigDir.raw(),
-                                   path.raw() + configDir.length());
+                path = Utf8StrFmt("%s%s", newConfigDir.raw(),
+                                  path.raw() + configDir.length());
                 mSSData->mStateFilePath = path;
             }
@@ -6109 +5482 @@
              * and will save all snapshots in this case. */
             if (mData->mFirstSnapshot)
-                mData->mFirstSnapshot->updateSavedStatePaths (configDir,
-                                                              newConfigDir);
+                mData->mFirstSnapshot->updateSavedStatePaths(configDir.c_str(),
+                                                             newConfigDir.c_str());
         }
         while (0);
 
-        if (FAILED (rc))
+        if (FAILED(rc))
         {
             /* silently try to rename everything back */
             if (fileRenamed)
-                RTFileRename (newConfigFile.raw(), configFile.raw(), 0);
+                RTFileRename(newConfigFile.raw(), configFile.raw(), 0);
             if (dirRenamed)
-                RTPathRename (newConfigDir.raw(), configDir.raw(), 0);
-        }
-
-        if (!aNew)
-        {
-            /* lock the config again */
-            HRESULT rc2 = lockConfig();
-            if (SUCCEEDED(rc))
-                rc = rc2;
+                RTPathRename(newConfigDir.raw(), configDir.raw(), 0);
         }
 
@@ -6140 +5505 @@
 
         /* ensure the settings directory exists */
-        Utf8Str path(mData->mConfigFileFull);
+        Utf8Str path(mData->m_strConfigFileFull);
         path.stripFilename();
-        if (!RTDirExists(path))
-        {
-            vrc = RTDirCreateFullPath(path, 0777);
+        if (!RTDirExists(path.c_str()))
+        {
+            vrc = RTDirCreateFullPath(path.c_str(), 0777);
             if (RT_FAILURE(vrc))
             {
-                return setError (E_FAIL,
-                    tr ("Could not create a directory '%s' "
-                        "to save the settings file (%Rrc)"),
-                    path.raw(), vrc);
+                return setError(E_FAIL,
+                                tr("Could not create a directory '%s' to save the settings file (%Rrc)"),
+                                path.raw(),
+                                vrc);
             }
         }
 
         /* Note: open flags must correlate with RTFileOpen() in lockConfig() */
-        path = Utf8Str (mData->mConfigFileFull);
-        vrc = RTFileOpen (&mData->mHandleCfgFile, path,
-                          RTFILE_O_READWRITE | RTFILE_O_CREATE |
-                          RTFILE_O_DENY_WRITE);
-        if (RT_SUCCESS(vrc))
-        {
-            vrc = RTFileWrite (mData->mHandleCfgFile,
-                               (void *) gDefaultMachineConfig,
-                               strlen (gDefaultMachineConfig), NULL);
-        }
+        path = Utf8Str(mData->m_strConfigFileFull);
+        vrc = RTFileOpen(&mData->mHandleCfgFile, path.c_str(),
+                         RTFILE_O_READWRITE | RTFILE_O_CREATE |
+                         RTFILE_O_DENY_WRITE);
         if (RT_FAILURE(vrc))
         {
             mData->mHandleCfgFile = NIL_RTFILE;
-            return setError (E_FAIL,
-                tr ("Could not create the settings file '%s' (%Rrc)"),
-                path.raw(), vrc);
-        }
-        /* we do not close the file to simulate lockConfig() */
+            return setError(E_FAIL,
+                            tr("Could not create the settings file '%s' (%Rrc)"),
+                            path.raw(),
+                            vrc);
+        }
+        RTFileClose(mData->mHandleCfgFile);
     }
 
@@ -6197 +5557 @@
  * left unlocked: if this machine is an unregistered one.
  */
-HRESULT Machine::saveSettings (int aFlags /*= 0*/)
+HRESULT Machine::saveSettings(int aFlags /*= 0*/)
 {
     LogFlowThisFuncEnter();
@@ -6240 +5600 @@
     bool isRenamed = false;
     bool isNew = false;
-    rc = prepareSaveSettings (isRenamed, isNew);
+    rc = prepareSaveSettings(isRenamed, isNew);
     CheckComRCReturnRC(rc);
 
     try
     {
-        using namespace settings;
-        using namespace xml;
-
-        /* this object is locked for writing to prevent concurrent reads and writes */
-        File file (mData->mHandleCfgFile, Utf8Str (mData->mConfigFileFull));
-        XmlTreeBackend tree;
-
-        /* The newly created settings file is incomplete therefore we turn off
-         * validation. The rest is like in loadSettingsTree_ForUpdate().*/
-        rc = VirtualBox::loadSettingsTree (tree, file,
-                                           !isNew /* aValidate */,
-                                           false /* aCatchLoadErrors */,
-                                           false /* aAddDefaults */);
-        CheckComRCThrowRC (rc);
-
-        Key machineNode = tree.rootKey().createKey ("Machine");
-
-        /* uuid (required) */
-        Assert (!mData->mUuid.isEmpty());
-        machineNode.setValue <Guid> ("uuid", mData->mUuid);
-
-        /* name (required) */
-        Assert (!mUserData->mName.isEmpty());
-        machineNode.setValue <Bstr> ("name", mUserData->mName);
-
-        /* nameSync (optional, default is true) */
-        machineNode.setValueOr <bool> ("nameSync", !!mUserData->mNameSync, true);
-
-        /* Description node (optional) */
-        if (!mUserData->mDescription.isNull())
-        {
-            Key descNode = machineNode.createKey ("Description");
-            descNode.setKeyValue <Bstr> (mUserData->mDescription);
-        }
-        else
-        {
-            Key descNode = machineNode.findKey ("Description");
-            if (!descNode.isNull())
-                descNode.zap();
-        }
-
-        /* OSType (required) */
-        machineNode.setValue <Bstr> ("OSType", mUserData->mOSTypeId);
-
-        /* stateFile (optional) */
-        /// @todo The reason for MachineState_Restoring below:
-        /// PushGuestProperties() is always called from Console::powerDown()
-        /// (including the case when restoring from the saved state fails) and
-        /// calls SaveSettings() to save guest properties. Since the saved state
-        /// file is still present there (and should be kept), we must save it
-        /// while in Restoring state too. However, calling SaveSettings() from
-        /// PushGuestProperties() is wrong in the first place. A proper way is
-        /// to only save guest properties node and not involve the whole save
-        /// process.
-        if (mData->mMachineState == MachineState_Saved ||
-            mData->mMachineState == MachineState_Restoring)
-        {
-            Assert (!mSSData->mStateFilePath.isEmpty());
+        mData->m_pMachineConfigFile->uuid = mData->mUuid;
+        mData->m_pMachineConfigFile->strName = mUserData->mName;
+        mData->m_pMachineConfigFile->fNameSync = !!mUserData->mNameSync;
+        mData->m_pMachineConfigFile->strDescription = mUserData->mDescription;
+        mData->m_pMachineConfigFile->strOsType = mUserData->mOSTypeId;
+
+        if (    mData->mMachineState == MachineState_Saved
+             || mData->mMachineState == MachineState_Restoring
+           )
+        {
+            Assert(!mSSData->mStateFilePath.isEmpty());
             /* try to make the file name relative to the settings file dir */
             Utf8Str stateFilePath = mSSData->mStateFilePath;
-            calculateRelativePath (stateFilePath, stateFilePath);
-            machineNode.setStringValue ("stateFile", stateFilePath);
+            calculateRelativePath(stateFilePath, stateFilePath);
+
+            mData->m_pMachineConfigFile->strStateFile = stateFilePath;
         }
         else
         {
-            Assert (mSSData->mStateFilePath.isNull());
-            machineNode.zapValue ("stateFile");
-        }
-
-        /* currentSnapshot ID (optional) */
-        if (!mData->mCurrentSnapshot.isNull())
-        {
-            Assert (!mData->mFirstSnapshot.isNull());
-            machineNode.setValue<Guid>("currentSnapshot",
-                                       mData->mCurrentSnapshot->getId());
-        }
+            Assert(mSSData->mStateFilePath.isNull());
+            mData->m_pMachineConfigFile->strStateFile.setNull();
+        }
+
+        if (mData->mCurrentSnapshot)
+            mData->m_pMachineConfigFile->uuidCurrentSnapshot = mData->mCurrentSnapshot->getId();
         else
-        {
-            Assert (mData->mFirstSnapshot.isNull());
-            machineNode.zapValue ("currentSnapshot");
-        }
-
-        /* snapshotFolder (optional) */
-        /// @todo use the Bstr::NullOrEmpty constant and setValueOr
-        if (!mUserData->mSnapshotFolder.isEmpty())
-            machineNode.setValue <Bstr> ("snapshotFolder", mUserData->mSnapshotFolder);
-        else
-            machineNode.zapValue ("snapshotFolder");
-
-        /* currentStateModified (optional, default is true) */
-        machineNode.setValueOr <bool> ("currentStateModified",
-                                       !!currentStateModified, true);
-
-        /* lastStateChange */
-        machineNode.setValue <RTTIMESPEC> ("lastStateChange",
-                                           mData->mLastStateChange);
-
-        /* set the aborted attribute when appropriate, defaults to false */
-        machineNode.setValueOr <bool> ("aborted",
-                                       mData->mMachineState == MachineState_Aborted,
-                                       false);
-
-        /* Hardware node (required) */
-        {
-            /* first, delete the entire node if exists */
-            Key hwNode = machineNode.findKey ("Hardware");
-            if (!hwNode.isNull())
-                hwNode.zap();
-            /* then recreate it */
-            hwNode = machineNode.createKey ("Hardware");
-
-            rc = saveHardware (hwNode);
-            CheckComRCThrowRC (rc);
-        }
-
-        /* StorageControllers node (required) */
-        {
-            /* first, delete the entire node if exists */
-            Key storageNode = machineNode.findKey ("StorageControllers");
-            if (!storageNode.isNull())
-                storageNode.zap();
-            /* then recreate it */
-            storageNode = machineNode.createKey ("StorageControllers");
-
-            rc = saveStorageControllers (storageNode);
-            CheckComRCThrowRC (rc);
-        }
-
-        /* ask to save all snapshots when the machine name was changed since
-         * it may affect saved state file paths for online snapshots (see
-         * #openConfigLoader() for details) */
-        if (isRenamed)
-        {
-            rc = saveSnapshotSettingsWorker (machineNode, NULL,
-                                             SaveSS_UpdateAllOp);
-            CheckComRCThrowRC (rc);
-        }
-
-        /* save the settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file,
-                                           mData->mSettingsFileVersion);
-        CheckComRCThrowRC (rc);
+            mData->m_pMachineConfigFile->uuidCurrentSnapshot.clear();
+
+        mData->m_pMachineConfigFile->strSnapshotFolder = mUserData->mSnapshotFolder;
+        mData->m_pMachineConfigFile->fCurrentStateModified = !!currentStateModified;
+        mData->m_pMachineConfigFile->timeLastStateChange = mData->mLastStateChange;
+        mData->m_pMachineConfigFile->fAborted = (mData->mMachineState == MachineState_Aborted);
+
+        rc = saveHardware(mData->m_pMachineConfigFile->hardwareMachine);
+        CheckComRCThrowRC(rc);
+
+        rc = saveStorageControllers(mData->m_pMachineConfigFile->storageMachine);
+        CheckComRCThrowRC(rc);
+
+        // save snapshots
+        rc = saveAllSnapshots();
+        CheckComRCThrowRC(rc);
+
+        // now spit it all out
+        mData->m_pMachineConfigFile->write(mData->m_strConfigFileFull);
     }
     catch (HRESULT err)
@@ -6422 +5685 @@
 }
 
+HRESULT Machine::saveAllSnapshots()
+{
+    AssertReturn (isWriteLockOnCurrentThread(), E_FAIL);
+
+    HRESULT rc = S_OK;
+
+    try
+    {
+        mData->m_pMachineConfigFile->llFirstSnapshot.clear();
+
+        if (mData->mFirstSnapshot)
+        {
+            settings::Snapshot snapNew;
+            mData->m_pMachineConfigFile->llFirstSnapshot.push_back(snapNew);
+
+            // get reference to the fresh copy of the snapshot on the list and
+            // work on that copy directly to avoid excessive copying later
+            settings::Snapshot &snap = mData->m_pMachineConfigFile->llFirstSnapshot.front();
+
+            rc = mData->mFirstSnapshot->saveSnapshot(snap, false /*aAttrsOnly*/);
+            CheckComRCThrowRC(rc);
+        }
+
+//         if (mType == IsSessionMachine)
+//             mParent->onMachineDataChange(mData->mUuid);          @todo is this necessary?
+
+    }
+    catch (HRESULT err)
+    {
+        /* we assume that error info is set by the thrower */
+        rc = err;
+    }
+    catch (...)
+    {
+        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
+    }
+
+    return rc;
+}
+
 /**
- *  Wrapper for #saveSnapshotSettingsWorker() that opens the settings file
- *  and locates the <Machine> node in there. See #saveSnapshotSettingsWorker()
- *  for more details.
- *
- *  @param aSnapshot    Snapshot to operate on
- *  @param aOpFlags     Operation to perform, one of SaveSS_NoOp, SaveSS_AddOp
- *                      or SaveSS_UpdateAttrsOp possibly combined with
- *                      SaveSS_UpdateCurrentId.
- *
- *  @note Locks this object for writing + other child objects.
+ *  Saves the VM hardware configuration. It is assumed that the
+ *  given node is empty.
+ *
+ *  @param aNode    <Hardware> node to save the VM hardware confguration to.
  */
-HRESULT Machine::saveSnapshotSettings (Snapshot *aSnapshot, int aOpFlags)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
-
-    AssertReturn(mType == IsMachine || mType == IsSessionMachine, E_FAIL);
+HRESULT Machine::saveHardware(settings::Hardware &data)
+{
+    HRESULT rc = S_OK;
+
+    try
+    {
+        /* The hardware version attribute (optional).
+            Automatically upgrade from 1 to 2 when there is no saved state. (ugly!) */
+        if (    mHWData->mHWVersion == "1"
+             && mSSData->mStateFilePath.isEmpty()
+           )
+            mHWData->mHWVersion = "2";  /** @todo Is this safe, to update mHWVersion here? If not some other point needs to be found where this can be done. */
+
+        data.strVersion = mHWData->mHWVersion;
+
+        // CPU
+        data.fHardwareVirt = mHWData->mHWVirtExEnabled;
+        data.fNestedPaging = mHWData->mHWVirtExNestedPagingEnabled;
+        data.fVPID = mHWData->mHWVirtExVPIDEnabled;
+        data.fPAE = mHWData->mPAEEnabled;
+
+        data.cCPUs = mHWData->mCPUCount;
+
+        // memory
+        data.ulMemorySizeMB = mHWData->mMemorySize;
+
+        // boot order
+        data.mapBootOrder.clear();
+        for (size_t i = 0;
+             i < RT_ELEMENTS(mHWData->mBootOrder);
+             ++i)
+            data.mapBootOrder[i] = mHWData->mBootOrder[i];
+
+        // display
+        data.ulVRAMSizeMB = mHWData->mVRAMSize;
+        data.cMonitors = mHWData->mMonitorCount;
+        data.fAccelerate3D = !!mHWData->mAccelerate3DEnabled;
+        data.fAccelerate2DVideo = !!mHWData->mAccelerate2DVideoEnabled;
+
+#ifdef VBOX_WITH_VRDP
+        /* VRDP settings (optional) */
+        rc = mVRDPServer->saveSettings(data.vrdpSettings);
+        CheckComRCThrowRC(rc);
+#endif
+
+        /* BIOS (required) */
+        rc = mBIOSSettings->saveSettings(data.biosSettings);
+        CheckComRCThrowRC(rc);
+
+        /* DVD drive (required) */
+        rc = mDVDDrive->saveSettings(data.dvdDrive);
+        CheckComRCThrowRC(rc);
+
+        /* Flooppy drive (required) */
+        rc = mFloppyDrive->saveSettings(data.floppyDrive);
+        CheckComRCThrowRC(rc);
+
+        /* USB Controller (required) */
+        rc = mUSBController->saveSettings(data.usbController);
+        CheckComRCThrowRC(rc);
+
+        /* Network adapters (required) */
+        data.llNetworkAdapters.clear();
+        for (ULONG slot = 0;
+             slot < RT_ELEMENTS(mNetworkAdapters);
+             ++slot)
+        {
+            settings::NetworkAdapter nic;
+            nic.ulSlot = slot;
+            rc = mNetworkAdapters[slot]->saveSettings(nic);
+            CheckComRCThrowRC(rc);
+
+            data.llNetworkAdapters.push_back(nic);
+        }
+
+        /* Serial ports */
+        data.llSerialPorts.clear();
+        for (ULONG slot = 0;
+             slot < RT_ELEMENTS(mSerialPorts);
+             ++slot)
+        {
+            settings::SerialPort s;
+            s.ulSlot = slot;
+            rc = mSerialPorts[slot]->saveSettings(s);
+            CheckComRCReturnRC (rc);
+        }
+
+        /* Parallel ports */
+        data.llParallelPorts.clear();
+        for (ULONG slot = 0;
+             slot < RT_ELEMENTS(mParallelPorts);
+             ++slot)
+        {
+            settings::ParallelPort p;
+            p.ulSlot = slot;
+            rc = mParallelPorts[slot]->saveSettings(p);
+            CheckComRCReturnRC (rc);
+        }
+
+        /* Audio adapter */
+        rc = mAudioAdapter->saveSettings(data.audioAdapter);
+        CheckComRCReturnRC (rc);
+
+        /* Shared folders */
+        data.llSharedFolders.clear();
+        for (HWData::SharedFolderList::const_iterator it = mHWData->mSharedFolders.begin();
+            it != mHWData->mSharedFolders.end();
+            ++it)
+        {
+            ComObjPtr<SharedFolder> pFolder = *it;
+            settings::SharedFolder sf;
+            sf.strName = pFolder->name();
+            sf.strHostPath = pFolder->hostPath();
+            sf.fWritable = !!pFolder->writable();
+        }
+
+        // clipboard
+        data.clipboardMode = mHWData->mClipboardMode;
+
+        /* Guest */
+        data.ulMemoryBalloonSize = mHWData->mMemoryBalloonSize;
+        data.ulStatisticsUpdateInterval = mHWData->mStatisticsUpdateInterval;
+
+        // guest properties
+        data.llGuestProperties.clear();
+#ifdef VBOX_WITH_GUEST_PROPS
+        for (HWData::GuestPropertyList::const_iterator it = mHWData->mGuestProperties.begin();
+             it != mHWData->mGuestProperties.end();
+             ++it)
+        {
+            HWData::GuestProperty property = *it;
+
+            settings::GuestProperty prop;
+            prop.strName = property.strName;
+            prop.strValue = property.strValue;
+            prop.timestamp = property.mTimestamp;
+            char szFlags[guestProp::MAX_FLAGS_LEN + 1];
+            guestProp::writeFlags(property.mFlags, szFlags);
+            prop.strFlags = szFlags;
+
+            data.llGuestProperties.push_back(prop);
+        }
+
+        data.strNotificationPatterns = mHWData->mGuestPropertyNotificationPatterns;
+    }
+    catch(std::bad_alloc &e)
+    {
+        return E_OUTOFMEMORY;
+    }
+#endif /* VBOX_WITH_GUEST_PROPS defined */
+
+    AssertComRC(rc);
+    return rc;
+}
+
+/**
+ *  Saves the storage controller configuration.
+ *
+ *  @param aNode    <StorageControllers> node to save the VM hardware confguration to.
+ */
+HRESULT Machine::saveStorageControllers(settings::Storage &data)
+{
+    data.llStorageControllers.clear();
+
+    for (StorageControllerList::const_iterator it = mStorageControllers->begin();
+         it != mStorageControllers->end();
+         ++it)
+    {
+        HRESULT rc;
+        ComObjPtr<StorageController> pCtl = *it;
+
+        settings::StorageController ctl;
+        ctl.strName = pCtl->name();
+        ctl.controllerType = pCtl->controllerType();
+        ctl.storageBus = pCtl->storageBus();
+
+        /* Save the port count. */
+        ULONG portCount;
+        rc = pCtl->COMGETTER(PortCount)(&portCount);
+        ComAssertRCRet(rc, rc);
+        ctl.ulPortCount = portCount;
+
+        /* Save IDE emulation settings. */
+        if (ctl.controllerType == StorageControllerType_IntelAhci)
+        {
+            if (    (FAILED(rc = pCtl->GetIDEEmulationPort(0, &ctl.lIDE0MasterEmulationPort)))
+                 || (FAILED(rc = pCtl->GetIDEEmulationPort(1, &ctl.lIDE0SlaveEmulationPort)))
+                 || (FAILED(rc = pCtl->GetIDEEmulationPort(2, &ctl.lIDE1MasterEmulationPort)))
+                 || (FAILED(rc = pCtl->GetIDEEmulationPort(3, &ctl.lIDE1SlaveEmulationPort)))
+               )
+                ComAssertRCRet(rc, rc);
+        }
+
+        /* save the devices now. */
+        rc = saveStorageDevices(pCtl, ctl);
+        ComAssertRCRet(rc, rc);
+
+        data.llStorageControllers.push_back(ctl);
+    }
+
+    return S_OK;
+}
+
+/**
+ *  Saves the hard disk confguration.
+ *  It is assumed that the given node is empty.
+ *
+ *  @param aNode    <HardDiskAttachments> node to save the hard disk confguration to.
+ */
+HRESULT Machine::saveStorageDevices(ComObjPtr<StorageController> aStorageController,
+                                    settings::StorageController &data)
+{
+    using namespace settings;
+
+    HDData::AttachmentList atts;
+
+    HRESULT rc = getHardDiskAttachmentsOfController(Bstr(aStorageController->name()), atts);
+    CheckComRCReturnRC (rc);
+
+    data.llAttachedDevices.clear();
+    for (HDData::AttachmentList::const_iterator it = atts.begin();
+         it != atts.end();
+         ++it)
+    {
+        settings::AttachedDevice dev;
+
+        dev.type = settings::AttachedDevice::HardDisk;
+        dev.lPort = (*it)->port();
+        dev.lDevice = (*it)->device();
+        dev.uuid = (*it)->hardDisk()->id();
+
+        data.llAttachedDevices.push_back(dev);
+    }
+
+    return S_OK;
+}
+
+/**
+ *  Saves machine state settings as defined by aFlags
+ *  (SaveSTS_* values).
+ *
+ *  @param aFlags   Combination of SaveSTS_* flags.
+ *
+ *  @note Locks objects for writing.
+ */
+HRESULT Machine::saveStateSettings(int aFlags)
+{
+    if (aFlags == 0)
+        return S_OK;
+
+    AutoCaller autoCaller (this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     /* This object's write lock is also necessary to serialize file access
@@ -6445 +5988 @@
     AutoWriteLock alock(this);
 
-    AssertReturn(isConfigLocked(), E_FAIL);
-
     HRESULT rc = S_OK;
 
+    Assert(mData->m_pMachineConfigFile);
+
     try
     {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file */
-        File file (mData->mHandleCfgFile, Utf8Str (mData->mConfigFileFull));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_ForUpdate (tree, file);
-        CheckComRCReturnRC(rc);
-
-        Key machineNode = tree.rootKey().key ("Machine");
-
-        rc = saveSnapshotSettingsWorker (machineNode, aSnapshot, aOpFlags);
-        CheckComRCReturnRC(rc);
-
-        /* save settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file,
-                                           mData->mSettingsFileVersion);
-        CheckComRCReturnRC(rc);
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
-    }
-
-    return rc;
-}
-
-/**
- *  Performs the specified operation on the given snapshot
- *  in the settings file represented by \a aMachineNode.
- *
- *  If \a aOpFlags = SaveSS_UpdateAllOp, \a aSnapshot can be NULL to indicate
- *  that the whole tree of the snapshots should be updated in <Machine>.
- *  One particular case is when the last (and the only) snapshot should be
- *  removed (it is so when both mCurrentSnapshot and mFirstSnapshot are NULL).
- *
- *  \a aOp may be just SaveSS_UpdateCurrentId if only the currentSnapshot
- *  attribute of <Machine> needs to be updated.
- *
- *  @param aMachineNode <Machine> node in the opened settings file.
- *  @param aSnapshot    Snapshot to operate on.
- *  @param aOpFlags     Operation to perform, one of SaveSS_NoOp, SaveSS_AddOp
- *                      or SaveSS_UpdateAttrsOp possibly combined with
- *                      SaveSS_UpdateCurrentId.
- *
- *  @note Must be called with this object locked for writing.
- *        Locks child objects.
- */
-HRESULT Machine::saveSnapshotSettingsWorker (settings::Key &aMachineNode,
-                                             Snapshot *aSnapshot, int aOpFlags)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
-    AssertReturn(isWriteLockOnCurrentThread(), E_FAIL);
-
-    int op = aOpFlags & SaveSS_OpMask;
-    AssertReturn(
-        (aSnapshot && (op == SaveSS_AddOp || op == SaveSS_UpdateAttrsOp ||
-                       op == SaveSS_UpdateAllOp)) ||
-        (!aSnapshot && ((op == SaveSS_NoOp && (aOpFlags & SaveSS_CurrentId)) ||
-                        op == SaveSS_UpdateAllOp)),
-        E_FAIL);
-
-    HRESULT rc = S_OK;
-
-    bool recreateWholeTree = false;
-
-    do
-    {
-        if (op == SaveSS_NoOp)
-            break;
-
-        /* quick path: recreate the whole tree of the snapshots */
-        if (op == SaveSS_UpdateAllOp && aSnapshot == NULL)
-        {
-            /* first, delete the entire root snapshot node if it exists */
-            Key snapshotNode = aMachineNode.findKey ("Snapshot");
-            if (!snapshotNode.isNull())
-                snapshotNode.zap();
-
-            /* second, if we have any snapshots left, substitute aSnapshot
-             * with the first snapshot to recreate the whole tree, otherwise
-             * break */
-            if (mData->mFirstSnapshot)
-            {
-                aSnapshot = mData->mFirstSnapshot;
-                recreateWholeTree = true;
-            }
-            else
-                break;
-        }
-
-        Assert (!!aSnapshot);
-        ComObjPtr<Snapshot> parent = aSnapshot->parent();
-
-        if (op == SaveSS_AddOp)
-        {
-            Key parentNode;
-
-            if (parent)
-            {
-                rc = findSnapshotNode (parent, aMachineNode, NULL, &parentNode);
-                CheckComRCBreakRC (rc);
-
-                ComAssertBreak (!parentNode.isNull(), rc = E_FAIL);
-            }
-
-            do
-            {
-                Key snapshotsNode;
-
-                if (!parentNode.isNull())
-                    snapshotsNode = parentNode.createKey ("Snapshots");
-                else
-                    snapshotsNode = aMachineNode;
-                do
-                {
-                    Key snapshotNode = snapshotsNode.appendKey ("Snapshot");
-                    rc = aSnapshot->saveSnapshot(snapshotNode, false /* aAttrsOnly */);
-                    CheckComRCBreakRC (rc);
-
-                    /* when a new snapshot is added, this means diffs were created
-                     * for every normal/immutable hard disk of the VM, so we need to
-                     * save the current hard disk attachments */
-
-                    Key storageNode = aMachineNode.findKey ("StorageControllers");
-                    if (!storageNode.isNull())
-                        storageNode.zap();
-                    storageNode = aMachineNode.createKey ("StorageControllers");
-
-                    rc = saveStorageControllers (storageNode);
-                    CheckComRCBreakRC (rc);
-
-                    if (mHDData->mAttachments.size() != 0)
-                    {
-                        /* If we have one or more attachments then we definitely
-                         * created diffs for them and associated new diffs with
-                         * current settngs. So, since we don't use saveSettings(),
-                         * we need to inform callbacks manually. */
-                        if (mType == IsSessionMachine)
-                            mParent->onMachineDataChange(mData->mUuid);
-                    }
-                }
-                while (0);
-            }
-            while (0);
-
-            break;
-        }
-
-        Assert ((op == SaveSS_UpdateAttrsOp && !recreateWholeTree) ||
-                op == SaveSS_UpdateAllOp);
-
-        Key snapshotsNode;
-        Key snapshotNode;
-
-        if (!recreateWholeTree)
-        {
-            rc = findSnapshotNode (aSnapshot, aMachineNode,
-                                   &snapshotsNode, &snapshotNode);
-            CheckComRCBreakRC (rc);
-        }
-
-        if (snapshotsNode.isNull())
-            snapshotsNode = aMachineNode;
-
-        if (op == SaveSS_UpdateAttrsOp)
-            rc = aSnapshot->saveSnapshot(snapshotNode, true /* aAttrsOnly */);
-        else
-        {
-            if (!snapshotNode.isNull())
-                snapshotNode.zap();
-
-            snapshotNode = snapshotsNode.appendKey ("Snapshot");
-            rc = aSnapshot->saveSnapshot(snapshotNode, false /* aAttrsOnly */);
-            CheckComRCBreakRC (rc);
-        }
-    }
-    while (0);
-
-    if (SUCCEEDED(rc))
-    {
-        /* update currentSnapshot when appropriate */
-        if (aOpFlags & SaveSS_CurrentId)
-        {
-            if (!mData->mCurrentSnapshot.isNull())
-                aMachineNode.setValue<Guid>("currentSnapshot",
-                                            mData->mCurrentSnapshot->getId());
-            else
-                aMachineNode.zapValue ("currentSnapshot");
-        }
-        if (aOpFlags & SaveSS_CurStateModified)
-        {
-            /* defaults to true */
-            aMachineNode.setValueOr <bool> ("currentStateModified",
-                                            !!mData->mCurrentStateModified, true);
-        }
-    }
-
-    return rc;
-}
-
-/**
- *  Saves the VM hardware configuration. It is assumed that the
- *  given node is empty.
- *
- *  @param aNode    <Hardware> node to save the VM hardware confguration to.
- */
-HRESULT Machine::saveHardware (settings::Key &aNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
-
-    HRESULT rc = S_OK;
-
-    /* The hardware version attribute (optional).
-       Automatically upgrade from 1 to 2 when there is no saved state. (ugly!) */
-    {
-        Utf8Str hwVersion = mHWData->mHWVersion;
-        if (   hwVersion.compare ("1") == 0
-            && mSSData->mStateFilePath.isEmpty())
-            mHWData->mHWVersion = hwVersion = "2";  /** @todo Is this safe, to update mHWVersion here? If not some other point needs to be found where this can be done. */
-        if (hwVersion.compare ("2") == 0)           /** @todo get the default from the schema if possible. */
-            aNode.zapValue ("version");
-        else
-            aNode.setStringValue ("version", hwVersion.raw());
-    }
-
-    /* CPU (optional, but always created atm) */
-    {
-        Key cpuNode = aNode.createKey ("CPU");
-        Key hwVirtExNode = cpuNode.createKey ("HardwareVirtEx");
-        const char *value = NULL;
-        if (mHWData->mHWVirtExEnabled)
-            value = "true";
-        else
-            value = "false";
-        hwVirtExNode.setStringValue ("enabled", value);
-
-        /* Nested paging (optional, default is false) */
-        if (mHWData->mHWVirtExNestedPagingEnabled)
-        {
-            Key HWVirtExNestedPagingNode = cpuNode.createKey ("HardwareVirtExNestedPaging");
-            HWVirtExNestedPagingNode.setValue <bool> ("enabled", true);
-        }
-
-        /* VPID (optional, default is false) */
-        if (mHWData->mHWVirtExVPIDEnabled)
-        {
-            Key HWVirtExVPIDNode = cpuNode.createKey ("HardwareVirtExVPID");
-            HWVirtExVPIDNode.setValue <bool> ("enabled", true);
-        }
-
-        /* PAE (optional, default is false) */
-        if (mHWData->mPAEEnabled)
-        {
-            Key PAENode = cpuNode.createKey ("PAE");
-            PAENode.setValue <bool> ("enabled", true);
-        }
-
-        /* CPU count */
-        cpuNode.setValue <ULONG> ("count", mHWData->mCPUCount);
-    }
-
-    /* memory (required) */
-    {
-        Key memoryNode = aNode.createKey ("Memory");
-        memoryNode.setValue <ULONG> ("RAMSize", mHWData->mMemorySize);
-    }
-
-    /* boot (required) */
-    {
-        Key bootNode = aNode.createKey ("Boot");
-
-        for (ULONG pos = 0; pos < RT_ELEMENTS (mHWData->mBootOrder); ++ pos)
-        {
-            const char *device = NULL;
-            switch (mHWData->mBootOrder [pos])
-            {
-                case DeviceType_Null:
-                    /* skip, this is allowed for <Order> nodes
-                     * when loading, the default value NoDevice will remain */
-                    continue;
-                case DeviceType_Floppy:         device = "Floppy"; break;
-                case DeviceType_DVD:            device = "DVD"; break;
-                case DeviceType_HardDisk:       device = "HardDisk"; break;
-                case DeviceType_Network:        device = "Network"; break;
-                default:
-                {
-                    ComAssertMsgFailedRet (("Invalid boot device: %d",
-                                            mHWData->mBootOrder [pos]),
-                                            E_FAIL);
-                }
-            }
-
-            Key orderNode = bootNode.appendKey ("Order");
-            orderNode.setValue <ULONG> ("position", pos + 1);
-            orderNode.setStringValue ("device", device);
-        }
-    }
-
-    /* display (required) */
-    {
-        Key displayNode = aNode.createKey ("Display");
-        displayNode.setValue <ULONG> ("VRAMSize", mHWData->mVRAMSize);
-        displayNode.setValue <ULONG> ("monitorCount", mHWData->mMonitorCount);
-        displayNode.setValue <bool> ("accelerate3D", !!mHWData->mAccelerate3DEnabled);
-        displayNode.setValue <bool> ("accelerate2DVideo", !!mHWData->mAccelerate2DVideoEnabled);
-    }
-
-#ifdef VBOX_WITH_VRDP
-    /* VRDP settings (optional) */
-    rc = mVRDPServer->saveSettings (aNode);
-    CheckComRCReturnRC(rc);
-#endif
-
-    /* BIOS (required) */
-    rc = mBIOSSettings->saveSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* DVD drive (required) */
-    rc = mDVDDrive->saveSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* Flooppy drive (required) */
-    rc = mFloppyDrive->saveSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* USB Controller (required) */
-    rc = mUSBController->saveSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* Network adapters (required) */
-    {
-        Key nwNode = aNode.createKey ("Network");
-
-        for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); ++ slot)
-        {
-            Key adapterNode = nwNode.appendKey ("Adapter");
-
-            adapterNode.setValue <ULONG> ("slot", slot);
-
-            rc = mNetworkAdapters [slot]->saveSettings (adapterNode);
-            CheckComRCReturnRC(rc);
-        }
-    }
-
-    /* Serial ports */
-    {
-        Key serialNode = aNode.createKey ("UART");
-
-        for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); ++ slot)
-        {
-            Key portNode = serialNode.appendKey ("Port");
-
-            portNode.setValue <ULONG> ("slot", slot);
-
-            rc = mSerialPorts [slot]->saveSettings (portNode);
-            CheckComRCReturnRC(rc);
-        }
-    }
-
-    /* Parallel ports */
-    {
-        Key parallelNode = aNode.createKey ("LPT");
-
-        for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); ++ slot)
-        {
-            Key portNode = parallelNode.appendKey ("Port");
-
-            portNode.setValue <ULONG> ("slot", slot);
-
-            rc = mParallelPorts [slot]->saveSettings (portNode);
-            CheckComRCReturnRC(rc);
-        }
-    }
-
-    /* Audio adapter */
-    rc = mAudioAdapter->saveSettings (aNode);
-    CheckComRCReturnRC(rc);
-
-    /* Shared folders */
-    {
-        Key sharedFoldersNode = aNode.createKey ("SharedFolders");
-
-        for (HWData::SharedFolderList::const_iterator it = mHWData->mSharedFolders.begin();
-             it != mHWData->mSharedFolders.end();
-             ++ it)
-        {
-            ComObjPtr<SharedFolder> folder = *it;
-
-            Key folderNode = sharedFoldersNode.appendKey ("SharedFolder");
-
-            /* all are mandatory */
-            folderNode.setValue <Bstr> ("name", folder->name());
-            folderNode.setValue <Bstr> ("hostPath", folder->hostPath());
-            folderNode.setValue <bool> ("writable", !!folder->writable());
-        }
-    }
-
-    /* Clipboard */
-    {
-        Key clipNode = aNode.createKey ("Clipboard");
-
-        const char *modeStr = "Disabled";
-        switch (mHWData->mClipboardMode)
-        {
-            case ClipboardMode_Disabled:
-                /* already assigned */
-                break;
-            case ClipboardMode_HostToGuest:
-                modeStr = "HostToGuest";
-                break;
-            case ClipboardMode_GuestToHost:
-                modeStr = "GuestToHost";
-                break;
-            case ClipboardMode_Bidirectional:
-                modeStr = "Bidirectional";
-                break;
-            default:
-                ComAssertMsgFailedRet (("Clipboard mode %d is invalid",
-                                        mHWData->mClipboardMode),
-                                       E_FAIL);
-        }
-        clipNode.setStringValue ("mode", modeStr);
-    }
-
-    /* Guest */
-    {
-        Key guestNode = aNode.createKey ("Guest");
-
-        guestNode.setValue <ULONG> ("memoryBalloonSize",
-                                    mHWData->mMemoryBalloonSize);
-        guestNode.setValue <ULONG> ("statisticsUpdateInterval",
-                                    mHWData->mStatisticsUpdateInterval);
-    }
-
-#ifdef VBOX_WITH_GUEST_PROPS
-    /* Guest properties */
-    try
-    {
-        using namespace guestProp;
-
-        Key guestPropertiesNode = aNode.createKey ("GuestProperties");
-
-        for (HWData::GuestPropertyList::const_iterator it = mHWData->mGuestProperties.begin();
-             it != mHWData->mGuestProperties.end(); ++it)
-        {
-            HWData::GuestProperty property = *it;
-
-            Key propertyNode = guestPropertiesNode.appendKey ("GuestProperty");
-            char szFlags[MAX_FLAGS_LEN + 1];
-
-            propertyNode.setValue <Bstr> ("name", property.mName);
-            propertyNode.setValue <Bstr> ("value", property.mValue);
-            propertyNode.setValue <ULONG64> ("timestamp", property.mTimestamp);
-            writeFlags (property.mFlags, szFlags);
-            Bstr flags (szFlags);
-            if (flags.isNull())
-                return E_OUTOFMEMORY;
-            propertyNode.setValue <Bstr> ("flags", flags);
-        }
-        Bstr emptyStr ("");
-        if (emptyStr.isNull())
-            return E_OUTOFMEMORY;
-        guestPropertiesNode.setValueOr <Bstr> ("notificationPatterns",
-                                               mHWData->mGuestPropertyNotificationPatterns,
-                                               emptyStr);
-    }
-    catch(std::bad_alloc &e)
-    {
-        return E_OUTOFMEMORY;
-    }
-#endif /* VBOX_WITH_GUEST_PROPS defined */
-
-    AssertComRC (rc);
-    return rc;
-}
-
-/**
- *  Saves the storage controller configuration.
- *
- *  @param aNode    <StorageControllers> node to save the VM hardware confguration to.
- */
-HRESULT Machine::saveStorageControllers (settings::Key &aNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
-
-    for (StorageControllerList::const_iterator
-         it = mStorageControllers->begin();
-         it != mStorageControllers->end();
-         ++ it)
-    {
-        HRESULT rc;
-        const char *type = NULL;
-        ComObjPtr<StorageController> ctl = *it;
-
-        Key ctlNode = aNode.appendKey ("StorageController");
-
-        ctlNode.setValue <Bstr> ("name", ctl->name());
-
-        switch (ctl->controllerType())
-        {
-            case StorageControllerType_IntelAhci: type = "AHCI"; break;
-            case StorageControllerType_LsiLogic: type = "LsiLogic"; break;
-            case StorageControllerType_BusLogic: type = "BusLogic"; break;
-            case StorageControllerType_PIIX3: type = "PIIX3"; break;
-            case StorageControllerType_PIIX4: type = "PIIX4"; break;
-            case StorageControllerType_ICH6: type = "ICH6"; break;
-            default:
-                ComAssertFailedRet (E_FAIL);
-        }
-
-        ctlNode.setStringValue ("type", type);
-
-        /* Save the port count. */
-        ULONG portCount;
-        rc = ctl->COMGETTER(PortCount)(&portCount);
-        ComAssertRCRet(rc, rc);
-        ctlNode.setValue <ULONG> ("PortCount", portCount);
-
-        /* Save IDE emulation settings. */
-        if (ctl->controllerType() == StorageControllerType_IntelAhci)
-        {
-            LONG uVal;
-
-            rc = ctl->GetIDEEmulationPort(0, &uVal);
-            ComAssertRCRet(rc, rc);
-            ctlNode.setValue <LONG> ("IDE0MasterEmulationPort", uVal);
-
-            rc = ctl->GetIDEEmulationPort(1, &uVal);
-            ComAssertRCRet(rc, rc);
-            ctlNode.setValue <LONG> ("IDE0SlaveEmulationPort", uVal);
-
-            rc = ctl->GetIDEEmulationPort(2, &uVal);
-            ComAssertRCRet(rc, rc);
-            ctlNode.setValue <LONG> ("IDE1MasterEmulationPort", uVal);
-
-            rc = ctl->GetIDEEmulationPort(3, &uVal);
-            ComAssertRCRet(rc, rc);
-            ctlNode.setValue <LONG> ("IDE1SlaveEmulationPort", uVal);
-        }
-
-        /* save the devices now. */
-        rc = saveStorageDevices(ctl, ctlNode);
-        ComAssertRCRet(rc, rc);
-    }
-
-    return S_OK;
-}
-
-/**
- *  Saves the hard disk confguration.
- *  It is assumed that the given node is empty.
- *
- *  @param aNode    <HardDiskAttachments> node to save the hard disk confguration to.
- */
-HRESULT Machine::saveStorageDevices (ComObjPtr<StorageController> aStorageController,
-                                     settings::Key &aNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
-
-    HDData::AttachmentList atts;
-
-    HRESULT rc = getHardDiskAttachmentsOfController(aStorageController->name(), atts);
-    CheckComRCReturnRC(rc);
-
-    for (HDData::AttachmentList::const_iterator
-         it = atts.begin();
-         it != atts.end();
-         ++ it)
-    {
-        Key hdNode = aNode.appendKey ("AttachedDevice");
-
-        {
-            /* device type. Only hard disk allowed atm. */
-            hdNode.setStringValue ("type", "HardDisk");
-            /* channel (required) */
-            hdNode.setValue <LONG> ("port", (*it)->port());
-            /* device (required) */
-            hdNode.setValue <LONG> ("device", (*it)->device());
-            /* ID of the image. */
-            Key idNode = hdNode.appendKey ("Image");
-            idNode.setValue <Guid> ("uuid", (*it)->hardDisk()->id());
-        }
-    }
-
-    return S_OK;
-}
-
-/**
- *  Saves machine state settings as defined by aFlags
- *  (SaveSTS_* values).
- *
- *  @param aFlags   Combination of SaveSTS_* flags.
- *
- *  @note Locks objects for writing.
- */
-HRESULT Machine::saveStateSettings (int aFlags)
-{
-    if (aFlags == 0)
-        return S_OK;
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
-
-    /* This object's write lock is also necessary to serialize file access
-     * (prevent concurrent reads and writes) */
-    AutoWriteLock alock(this);
-
-    AssertReturn(isConfigLocked(), E_FAIL);
-
-    HRESULT rc = S_OK;
-
-    try
-    {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file */
-        File file (mData->mHandleCfgFile, Utf8Str (mData->mConfigFileFull));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_ForUpdate (tree, file);
-        CheckComRCReturnRC(rc);
-
-        Key machineNode = tree.rootKey().key ("Machine");
-
         if (aFlags & SaveSTS_CurStateModified)
-        {
-            /* defaults to true */
-            machineNode.setValueOr <bool> ("currentStateModified",
-                                           !!mData->mCurrentStateModified, true);
-        }
+            mData->m_pMachineConfigFile->fCurrentStateModified = true;
 
         if (aFlags & SaveSTS_StateFilePath)
-        {
             if (mSSData->mStateFilePath)
             {
                 /* try to make the file name relative to the settings file dir */
                 Utf8Str stateFilePath = mSSData->mStateFilePath;
-                calculateRelativePath (stateFilePath, stateFilePath);
-                machineNode.setStringValue ("stateFile", stateFilePath);
+                calculateRelativePath(stateFilePath, stateFilePath);
+                mData->m_pMachineConfigFile->strStateFile = stateFilePath;
             }
             else
-                machineNode.zapValue ("stateFile");
-        }
+                mData->m_pMachineConfigFile->strStateFile.setNull();
 
         if (aFlags & SaveSTS_StateTimeStamp)
         {
-            Assert (mData->mMachineState != MachineState_Aborted ||
-                    mSSData->mStateFilePath.isNull());
-
-            machineNode.setValue <RTTIMESPEC> ("lastStateChange",
-                                               mData->mLastStateChange);
-
-            /* set the aborted attribute when appropriate, defaults to false */
-            machineNode.setValueOr <bool> ("aborted",
-                                           mData->mMachineState == MachineState_Aborted,
-                                           false);
-        }
-
-        /* save settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file,
-                                           mData->mSettingsFileVersion);
-        CheckComRCReturnRC(rc);
+            Assert(    mData->mMachineState != MachineState_Aborted
+                    || mSSData->mStateFilePath.isNull());
+
+            mData->m_pMachineConfigFile->timeLastStateChange = mData->mLastStateChange;
+
+            mData->m_pMachineConfigFile->fAborted = (mData->mMachineState == MachineState_Aborted);
+        }
+
+        mData->m_pMachineConfigFile->write(mData->m_strConfigFileFull);
     }
     catch (...)
@@ -7200 +6094 @@
 
                 rc = hd->LockRead (NULL);
-                CheckComRCThrowRC (rc);
+                CheckComRCThrowRC(rc);
 
                 lockedMedia.push_back (hd);
@@ -7232 +6126 @@
                                                          hd->root()->name().raw()),
                                                  1);        // weight
-                CheckComRCThrowRC (rc);
+                CheckComRCThrowRC(rc);
 
                 mHDData->mAttachments.push_back (hda);
@@ -7243 +6137 @@
                                                      hd->root()->name().raw()),
                                              1);        // weight
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
 
             ComObjPtr<HardDisk> diff;
             diff.createObject();
-            rc = diff->init (mParent, hd->preferredDiffFormat(),
-                             BstrFmt ("%ls"RTPATH_SLASH_STR,
-                                      mUserData->mSnapshotFolderFull.raw()));
-            CheckComRCThrowRC (rc);
+            rc = diff->init(mParent,
+                            hd->preferredDiffFormat(),
+                            BstrFmt("%ls"RTPATH_SLASH_STR,
+                                    mUserData->mSnapshotFolderFull.raw()));
+            CheckComRCThrowRC(rc);
 
             /* leave the lock before the potentially lengthy operation */
@@ -7260 +6155 @@
             alock.enter();
 
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
 
             rc = diff->attachTo (mData->mUuid);
@@ -7270 +6165 @@
             rc = attachment->init (diff, hda->controller(), hda->port(),
                                    hda->device(), true /* aImplicit */);
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
 
             mHDData->mAttachments.push_back (attachment);
@@ -7286 +6181 @@
         {
             HRESULT rc2 = (*it)->UnlockRead (NULL);
-            AssertComRC (rc2);
-        }
-    }
-
-    if (FAILED (rc))
+            AssertComRC(rc2);
+        }
+    }
+
+    if (FAILED(rc))
     {
         MultiResultRef mrc (rc);
@@ -7336 +6231 @@
             /* deassociate and mark for deletion */
             rc = hd->detachFrom (mData->mUuid);
-            AssertComRC (rc);
+            AssertComRC(rc);
             implicitAtts.push_back (*it);
             continue;
@@ -7349 +6244 @@
             /* no: de-associate */
             rc = hd->detachFrom (mData->mUuid);
-            AssertComRC (rc);
+            AssertComRC(rc);
             continue;
         }
@@ -7447 +6342 @@
                 {
                     rc = hd->LockWrite (NULL);
-                    AssertComRC (rc);
+                    AssertComRC(rc);
 
                     mData->mSession.mLockedMedia.push_back (
@@ -7460 +6355 @@
                     AutoWriteLock parentLock (parent);
                     rc = parent->UnlockWrite (NULL);
-                    AssertComRC (rc);
+                    AssertComRC(rc);
                     rc = parent->LockRead (NULL);
-                    AssertComRC (rc);
+                    AssertComRC(rc);
 
                     /* XXX actually we should replace the old entry in that
@@ -7496 +6391 @@
             /* now de-associate from the current machine state */
             rc = hd->detachFrom (mData->mUuid);
-            AssertComRC (rc);
+            AssertComRC(rc);
 
             if (aOnline)
@@ -7526 +6421 @@
 
 /**
- *  Helper to lock the machine configuration for write access.
- *
- *  @return S_OK or E_FAIL and sets error info on failure
- *
- *  @note Doesn't lock anything (must be called from this object's lock)
- */
-HRESULT Machine::lockConfig()
-{
-    HRESULT rc = S_OK;
-
-    if (!isConfigLocked())
-    {
-        /* open the associated config file */
-        int vrc = RTFileOpen (&mData->mHandleCfgFile,
-                              Utf8Str (mData->mConfigFileFull),
-                              RTFILE_O_READWRITE | RTFILE_O_OPEN |
-                              RTFILE_O_DENY_WRITE);
-        if (RT_FAILURE(vrc) && (vrc != VERR_FILE_NOT_FOUND))
-        {
-            /* Open the associated config file only with read access. */
-            vrc = RTFileOpen (&mData->mHandleCfgFile,
-                              Utf8Str (mData->mConfigFileFull),
-                              RTFILE_O_READ | RTFILE_O_OPEN |
-                              RTFILE_O_DENY_NONE);
-            if (RT_FAILURE(vrc))
-            {
-                /* We even cannot open it in read mode, so there's seriously
-                   something wrong. */
-                rc = setError (E_FAIL,
-                        tr ("Could not even open settings file '%ls' in read mode (%Rrc)"),
-                        mData->mConfigFile.raw(), vrc);
-            }
-            else
-            {
-                mData->mConfigFileReadonly = TRUE;
-            }
-        }
-        else
-        {
-            mData->mConfigFileReadonly = FALSE;
-        }
-
-        if (RT_FAILURE(vrc))
-        {
-            mData->mHandleCfgFile = NIL_RTFILE;
-            mData->mConfigFileReadonly = FALSE;
-        }
-    }
-
-    LogFlowThisFunc(("mConfigFile={%ls}, mHandleCfgFile=%d, rc=%08X\n",
-                      mData->mConfigFileFull.raw(), mData->mHandleCfgFile, rc));
-    return rc;
-}
-
-/**
- *  Helper to unlock the machine configuration from write access
- *
- *  @return S_OK
- *
- *  @note Doesn't lock anything.
- *  @note Not thread safe (must be called from this object's lock).
- */
-HRESULT Machine::unlockConfig()
-{
-    HRESULT rc = S_OK;
-
-    if (isConfigLocked())
-    {
-        RTFileFlush (mData->mHandleCfgFile);
-        RTFileClose (mData->mHandleCfgFile);
-        /** @todo flush the directory. */
-        mData->mHandleCfgFile = NIL_RTFILE;
-        mData->mConfigFileReadonly = FALSE;
-    }
-
-    LogFlowThisFunc(("\n"));
-
-    return rc;
-}
-
-/**
  *  Returns true if the settings file is located in the directory named exactly
  *  as the machine. This will be true if the machine settings structure was
@@ -7619 +6433 @@
 bool Machine::isInOwnDir(Utf8Str *aSettingsDir /* = NULL */)
 {
-    Utf8Str settingsDir = mData->mConfigFileFull;
+    Utf8Str settingsDir = mData->m_strConfigFileFull;
     settingsDir.stripFilename();
-    char *dirName = RTPathFilename(settingsDir);
+    char *dirName = RTPathFilename(settingsDir.c_str());
 
     AssertReturn(dirName, false);
@@ -8317 +7131 @@
     if (mIPCSem < 0 && errnoSave == ENOSYS)
     {
-        setError (E_FAIL,
-                  tr ("Cannot create IPC semaphore. Most likely your host kernel lacks "
-                      "support for SysV IPC. Check the host kernel configuration for "
-                      "CONFIG_SYSVIPC=y"));
+        setError(E_FAIL,
+                 tr("Cannot create IPC semaphore. Most likely your host kernel lacks "
+                    "support for SysV IPC. Check the host kernel configuration for "
+                    "CONFIG_SYSVIPC=y"));
         return E_FAIL;
     }
@@ -8523 +7337 @@
          * for the aAbnormal argument. */
         HRESULT rc = mUSBController->notifyProxy (false /* aInsertFilters */);
-        AssertComRC (rc);
+        AssertComRC(rc);
         NOREF (rc);
 
@@ -8803 +7617 @@
 #ifdef VBOX_WITH_USB
     HRESULT rc = mUSBController->notifyProxy (true /* aInsertFilters */);
-    AssertComRC (rc);
+    AssertComRC(rc);
     NOREF (rc);
 
@@ -8833 +7647 @@
 #ifdef VBOX_WITH_USB
     HRESULT rc = mUSBController->notifyProxy (false /* aInsertFilters */);
-    AssertComRC (rc);
+    AssertComRC(rc);
     NOREF (rc);
 
@@ -9021 +7835 @@
 
     Utf8Str stateFilePathFull = aSavedStateFile;
-    int vrc = calculateFullPath (stateFilePathFull, stateFilePathFull);
+    int vrc = calculateFullPath(stateFilePathFull, stateFilePathFull);
     if (RT_FAILURE(vrc))
-        return setError (VBOX_E_FILE_ERROR,
-            tr ("Invalid saved state file path '%ls' (%Rrc)"),
-                aSavedStateFile, vrc);
+        return setError(VBOX_E_FILE_ERROR,
+                        tr("Invalid saved state file path '%ls' (%Rrc)"),
+                        aSavedStateFile,
+                        vrc);
 
     mSSData->mStateFilePath = stateFilePathFull;
@@ -9110 +7925 @@
     if (stateFilePath)
     {
-        HRESULT rc = VirtualBox::ensureFilePathExists (Utf8Str (stateFilePath));
+        HRESULT rc = VirtualBox::ensureFilePathExists(Utf8Str(stateFilePath));
         CheckComRCReturnRC(rc);
     }
@@ -9277 +8092 @@
             AutoWriteLock vboxLock(mParent);
             rc = saveSettings();
-            CheckComRCReturnRC(rc);
+            CheckComRCReturnRC (rc);
             vboxLock.unlock();
 
@@ -9339 +8154 @@
 
     if (mData->mCurrentSnapshot.isNull())
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("Could not discard the current state of the machine '%ls' "
-                "because it doesn't have any snapshots"),
-            mUserData->mName.raw());
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("Could not discard the current state of the machine '%ls' because it doesn't have any snapshots"),
+                        mUserData->mName.raw());
 
     /* create a progress object. The number of operations is: 1 (preparing) + #
@@ -9403 +8217 @@
 
     if (mData->mCurrentSnapshot.isNull())
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("Could not discard the current state of the machine '%ls' "
-                "because it doesn't have any snapshots"),
-            mUserData->mName.raw());
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("Could not discard the current state of the machine '%ls' "
+                           "because it doesn't have any snapshots"),
+                        mUserData->mName.raw());
 
     /* create a progress object. The number of operations is:
@@ -9471 +8285 @@
 }
 
-STDMETHODIMP SessionMachine::
-PullGuestProperties (ComSafeArrayOut(BSTR, aNames),
-                     ComSafeArrayOut(BSTR, aValues),
-                     ComSafeArrayOut(ULONG64, aTimestamps),
-                     ComSafeArrayOut(BSTR, aFlags))
+STDMETHODIMP SessionMachine::PullGuestProperties(ComSafeArrayOut(BSTR, aNames),
+                                                 ComSafeArrayOut(BSTR, aValues),
+                                                 ComSafeArrayOut(ULONG64, aTimestamps),
+                                                 ComSafeArrayOut(BSTR, aFlags))
 {
     LogFlowThisFunc(("\n"));
@@ -9499 +8312 @@
     unsigned i = 0;
     for (HWData::GuestPropertyList::iterator it = mHWData->mGuestProperties.begin();
-         it != mHWData->mGuestProperties.end(); ++it)
+         it != mHWData->mGuestProperties.end();
+         ++it)
     {
         char szFlags[MAX_FLAGS_LEN + 1];
-        it->mName.cloneTo(&names[i]);
-        it->mValue.cloneTo(&values[i]);
+        it->strName.cloneTo(&names[i]);
+        it->strValue.cloneTo(&values[i]);
         timestamps[i] = it->mTimestamp;
-        writeFlags (it->mFlags, szFlags);
-        Bstr (szFlags).cloneTo(&flags[i]);
+        writeFlags(it->mFlags, szFlags);
+        Bstr(szFlags).cloneTo(&flags[i]);
         ++i;
     }
@@ -9520 +8334 @@
 }
 
-STDMETHODIMP SessionMachine::PushGuestProperties (ComSafeArrayIn (IN_BSTR, aNames),
-                                                  ComSafeArrayIn (IN_BSTR, aValues),
-                                                  ComSafeArrayIn (ULONG64, aTimestamps),
-                                                  ComSafeArrayIn (IN_BSTR, aFlags))
+STDMETHODIMP SessionMachine::PushGuestProperties(ComSafeArrayIn (IN_BSTR, aNames),
+                                                 ComSafeArrayIn (IN_BSTR, aValues),
+                                                 ComSafeArrayIn (ULONG64, aTimestamps),
+                                                 ComSafeArrayIn (IN_BSTR, aFlags))
 {
     LogFlowThisFunc(("\n"));
@@ -9578 +8392 @@
 }
 
-STDMETHODIMP SessionMachine::PushGuestProperty (IN_BSTR aName, IN_BSTR aValue,
-                                                ULONG64 aTimestamp, IN_BSTR aFlags)
+STDMETHODIMP SessionMachine::PushGuestProperty(IN_BSTR aName,
+                                               IN_BSTR aValue,
+                                               ULONG64 aTimestamp,
+                                               IN_BSTR aFlags)
 {
     LogFlowThisFunc(("\n"));
@@ -9614 +8430 @@
         mHWData.backup();
         for (HWData::GuestPropertyList::iterator iter = mHWData->mGuestProperties.begin();
-            iter != mHWData->mGuestProperties.end(); ++iter)
-            if (aName == iter->mName)
+             iter != mHWData->mGuestProperties.end();
+             ++iter)
+            if (utf8Name == iter->strName)
             {
-                mHWData->mGuestProperties.erase (iter);
+                mHWData->mGuestProperties.erase(iter);
                 break;
             }
@@ -9628 +8445 @@
         /* send a callback notification if appropriate */
         alock.leave();
-        if (   matchAll
-            || RTStrSimplePatternMultiMatch (utf8Patterns.raw(), RTSTR_MAX,
-                                            utf8Name.raw(), RTSTR_MAX, NULL)
+        if (    matchAll
+             || RTStrSimplePatternMultiMatch(utf8Patterns.raw(),
+                                             RTSTR_MAX,
+                                             utf8Name.raw(),
+                                             RTSTR_MAX, NULL)
         )
-            mParent->onGuestPropertyChange (mData->mUuid, aName, aValue, aFlags);
+            mParent->onGuestPropertyChange(mData->mUuid,
+                                           aName,
+                                           aValue,
+                                           aFlags);
     }
     catch(std::bad_alloc &e)
@@ -10072 +8894 @@
     {
         /* delete the saved state file (it might have been already created) */
-        RTFileDelete (Utf8Str (mSnapshotData.mStateFilePath));
+        RTFileDelete(Utf8Str(mSnapshotData.mStateFilePath).c_str());
     }
 
@@ -10122 +8944 @@
             mData->mFirstSnapshot = mData->mCurrentSnapshot;
 
-        int opFlags = SaveSS_AddOp | SaveSS_CurrentId;
         if (!Global::IsOnline (mSnapshotData.mLastState))
-        {
             /* the machine was powered off or saved when taking a snapshot, so
              * reset the mCurrentStateModified flag */
             mData->mCurrentStateModified = FALSE;
-            opFlags |= SaveSS_CurStateModified;
-        }
-
-        rc = saveSnapshotSettings (mSnapshotData.mSnapshot, opFlags);
+
+        rc = saveSettings();
     }
 
@@ -10158 +8976 @@
         /* delete the saved state file (it might have been already created) */
         if (mSnapshotData.mSnapshot->stateFilePath())
-            RTFileDelete (Utf8Str (mSnapshotData.mSnapshot->stateFilePath()));
+            RTFileDelete(Utf8Str(mSnapshotData.mSnapshot->stateFilePath()).c_str());
 
         mSnapshotData.mSnapshot->uninit();
@@ -10237 +9055 @@
 
         /* copy the state file */
-        int vrc = RTFileCopyEx (stateFrom, stateTo, 0, progressCallback,
-                                static_cast <Progress *> (mSnapshotData.mServerProgress));
+        int vrc = RTFileCopyEx(stateFrom.c_str(),
+                               stateTo.c_str(),
+                               0,
+                               progressCallback,
+                               static_cast<Progress*>(mSnapshotData.mServerProgress));
 
         alock.enter();
 
         if (RT_FAILURE(vrc))
-            rc = setError (E_FAIL,
-                tr ("Could not copy the state file '%s' to '%s' (%Rrc)"),
-                stateFrom.raw(), stateTo.raw(), vrc);
+            rc = setError(E_FAIL,
+                          tr("Could not copy the state file '%s' to '%s' (%Rrc)"),
+                          stateFrom.raw(),
+                          stateTo.raw(),
+                          vrc);
     }
 
@@ -10385 +9208 @@
              * prerequisites */
             rc = hd->prepareDiscard (chain);
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
 
             if (hd->parent().isNull() && chain != NULL)
@@ -10415 +9238 @@
                 /* adjust back references */
                 rc2 = replaceHd->detachFrom (mData->mUuid, snapshotId);
-                AssertComRC (rc2);
+                AssertComRC(rc2);
 
                 rc2 = hd->attachTo (mData->mUuid, snapshotId);
-                AssertComRC (rc2);
+                AssertComRC(rc2);
 
                 /* replace the hard disk in the attachment object */
@@ -10475 +9298 @@
             aTask.snapshot->uninit();
 
-            rc = saveSnapshotSettings(parentSnapshot,
-                                      SaveSS_UpdateAllOp | SaveSS_CurrentId | SaveSS_CurStateModified);
-            CheckComRCThrowRC (rc);
+            rc = saveAllSnapshots();
+            CheckComRCThrowRC(rc);
 
             /// @todo (dmik)
@@ -10487 +9309 @@
                                                  1);        // weight
 
-                RTFileDelete(Utf8Str(stateFilePath));
+                RTFileDelete(Utf8Str(stateFilePath).c_str());
             }
 
@@ -10519 +9341 @@
         {
             rc = it->hd->discard (aTask.progress, it->chain);
-            CheckComRCBreakRC (rc);
+            CheckComRCBreakRC(rc);
 
             /* prevent from calling cancelDiscard() */
@@ -10527 +9349 @@
         alock.enter();
 
-        CheckComRCThrowRC (rc);
+        CheckComRCThrowRC(rc);
     }
     catch (HRESULT aRC) { rc = aRC; }
 
-    if FAILED (rc)
+    if FAILED(rc)
     {
         HRESULT rc2 = S_OK;
@@ -10546 +9368 @@
 
                 rc2 = it->replaceHd->attachTo (mData->mUuid, it->snapshotId);
-                AssertComRC (rc2);
+                AssertComRC(rc2);
 
                 rc2 = it->hd->detachFrom (mData->mUuid, it->snapshotId);
-                AssertComRC (rc2);
+                AssertComRC(rc2);
 
                 AutoWriteLock attLock (it->replaceHda);
@@ -10557 +9379 @@
     }
 
-    if (!aTask.subTask || FAILED (rc))
+    if (!aTask.subTask || FAILED(rc))
     {
         if (!aTask.subTask)
@@ -10647 +9469 @@
         {
             Assert (!mSSData->mStateFilePath.isEmpty());
-            RTFileDelete (Utf8Str (mSSData->mStateFilePath));
+            RTFileDelete(Utf8Str(mSSData->mStateFilePath).c_str());
             mSSData->mStateFilePath.setNull();
             aTask.modifyLastState (MachineState_PoweredOff);
             rc = saveStateSettings (SaveSTS_StateFilePath);
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
         }
 
@@ -10671 +9493 @@
                  * a failure */
                 rc = aTask.progress->resultCode();
-                Assert (FAILED (rc));
+                Assert (FAILED(rc));
                 errorInSubtask = true;
                 throw rc;
@@ -10710 +9532 @@
             snapshotLock.lock();
 
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
 
             /* Note: on success, current (old) hard disks will be
@@ -10739 +9561 @@
 
                 /* copy the state file */
-                int vrc = RTFileCopyEx (snapStateFilePath, stateFilePath,
-                                        0, progressCallback, aTask.progress);
+                int vrc = RTFileCopyEx(snapStateFilePath.c_str(),
+                                       stateFilePath.c_str(),
+                                       0,
+                                       progressCallback,
+                                       aTask.progress);
 
                 alock.enter();
@@ -10751 +9576 @@
                 else
                 {
-                    throw setError (E_FAIL,
-                        tr ("Could not copy the state file '%s' to '%s' (%Rrc)"),
-                        snapStateFilePath.raw(), stateFilePath.raw(), vrc);
+                    throw setError(E_FAIL,
+                                   tr("Could not copy the state file '%s' to '%s' (%Rrc)"),
+                                   snapStateFilePath.raw(),
+                                   stateFilePath.raw(),
+                                   vrc);
                 }
             }
@@ -10815 +9642 @@
                  * was a failure */
                 rc = aTask.progress->resultCode();
-                Assert (FAILED (rc));
+                Assert (FAILED(rc));
                 errorInSubtask = true;
             }
@@ -10852 +9679 @@
          * already committed machine data and deleted old diffs before
          * discarding the current snapshot so there is no way to rollback */
-        HRESULT rc2 = saveSettings (SaveS_ResetCurStateModified | saveFlags);
+        HRESULT rc2 = saveSettings(SaveS_ResetCurStateModified | saveFlags);
 
         /// @todo NEWMEDIA return multiple errors
@@ -10964 +9791 @@
                 {
                     rc = hd->LockWrite (&mediaState);
-                    CheckComRCThrowRC (rc);
+                    CheckComRCThrowRC(rc);
 
                     mData->mSession.mLockedMedia.push_back (
@@ -10975 +9802 @@
                 {
                     rc = hd->LockRead (&mediaState);
-                    CheckComRCThrowRC (rc);
+                    CheckComRCThrowRC(rc);
 
                     mData->mSession.mLockedMedia.push_back (
@@ -11042 +9869 @@
             MediaState_T mediaState;
             rc = (*it)->COMGETTER(State) (&mediaState);
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
 
             Assert (mediaState == MediaState_LockedRead ||
@@ -11052 +9879 @@
             Bstr error;
             rc = (*it)->COMGETTER(LastAccessError) (error.asOutParam());
-            CheckComRCThrowRC (rc);
+            CheckComRCThrowRC(rc);
 
             if (!error.isEmpty())
@@ -11058 +9885 @@
                 Bstr loc;
                 rc = (*it)->COMGETTER(Location) (loc.asOutParam());
-                CheckComRCThrowRC (rc);
+                CheckComRCThrowRC(rc);
 
                 /* collect multiple errors */
@@ -11065 +9892 @@
                 /* be in sync with MediumBase::setStateError() */
                 Assert (!error.isEmpty());
-                mrc = setError (E_FAIL,
-                    tr ("Medium '%ls' is not accessible. %ls"),
-                    loc.raw(), error.raw());
+                mrc = setError(E_FAIL,
+                               tr("Medium '%ls' is not accessible. %ls"),
+                               loc.raw(),
+                               error.raw());
 
                 eik.fetch();
@@ -11074 +9902 @@
 
         eik.restore();
-        CheckComRCThrowRC ((HRESULT) mrc);
+        CheckComRCThrowRC((HRESULT) mrc);
     }
     catch (HRESULT aRC)
@@ -11237 +10065 @@
         {
             Assert (!mSSData->mStateFilePath.isEmpty());
-            RTFileDelete (Utf8Str (mSSData->mStateFilePath));
+            RTFileDelete(Utf8Str(mSSData->mStateFilePath).c_str());
         }
         mSSData->mStateFilePath.setNull();
@@ -11363 +10191 @@
 HRESULT SnapshotMachine::init (SessionMachine *aSessionMachine,
                                IN_GUID aSnapshotId,
-                               IN_BSTR aStateFilePath)
+                               const Utf8Str &aStateFilePath)
 {
     LogFlowThisFuncEnter();
@@ -11421 +10249 @@
     {
         rc = (*it)->hardDisk()->attachTo (mData->mUuid, mSnapshotId);
-        AssertComRC (rc);
+        AssertComRC(rc);
     }
 
@@ -11497 +10325 @@
  *  @note Doesn't lock anything.
  */
-HRESULT SnapshotMachine::init (Machine *aMachine,
-                               const settings::Key &aHWNode,
-                               const settings::Key &aHDAsNode,
-                               IN_GUID aSnapshotId, IN_BSTR aStateFilePath)
+HRESULT SnapshotMachine::init(Machine *aMachine,
+                              const settings::Hardware &hardware,
+                              const settings::Storage &storage,
+                              IN_GUID aSnapshotId,
+                              const Utf8Str &aStateFilePath)
 {
     LogFlowThisFuncEnter();
     LogFlowThisFunc(("mName={%ls}\n", aMachine->mUserData->mName.raw()));
 
-    AssertReturn(aMachine && !aHWNode.isNull() && !aHDAsNode.isNull() &&
-                  !Guid (aSnapshotId).isEmpty(),
-                  E_INVALIDARG);
+    AssertReturn(aMachine &&  !Guid(aSnapshotId).isEmpty(), E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -11580 +10407 @@
     /* load hardware and harddisk settings */
 
-    HRESULT rc = loadHardware (aHWNode);
+    HRESULT rc = loadHardware(hardware);
     if (SUCCEEDED(rc))
-        rc = loadStorageControllers (aHDAsNode, true /* aRegistered */, &mSnapshotId);
+        rc = loadStorageControllers(storage, true /* aRegistered */, &mSnapshotId);
 
     if (SUCCEEDED(rc))
-    {
         /* commit all changes made during the initialization */
         commit();
-    }
 
     /* Confirm a successful initialization when it's the case */
@@ -11647 +10472 @@
     AutoWriteLock alock(this);
 
-    mPeer->saveSnapshotSettings (aSnapshot, SaveSS_UpdateAttrsOp);
+    //     mPeer->saveAllSnapshots();  @todo
 
     /* inform callbacks */

trunk/src/VBox/Main/MediumImpl.cpp

@@ -552 +552 @@
     Utf8Str path = m.locationFull;
 
-    if (RTPathStartsWith (path, aOldPath))
+    if (RTPathStartsWith(path.c_str(), aOldPath))
     {
         Utf8Str newPath = Utf8StrFmt ("%s%s", aNewPath,
@@ -688 +688 @@
     Utf8Str location (m.locationFull);
 
-    Utf8Str name = RTPathFilename (location);
+    Utf8Str name = RTPathFilename(location.c_str());
     return name;
 }
@@ -700 +700 @@
  * @note Must be called from under this object's write lock.
  */
-HRESULT MediumBase::setLocation (CBSTR aLocation)
+HRESULT MediumBase::setLocation(const Utf8Str &aLocation)
 {
     /* get the full file name */
     Utf8Str locationFull;
-    int vrc = mVirtualBox->calculateFullPath (Utf8Str (aLocation), locationFull);
+    int vrc = mVirtualBox->calculateFullPath(aLocation, locationFull);
     if (RT_FAILURE(vrc))
-        return setError (E_FAIL,
-            tr ("Invalid image file location '%ls' (%Rrc)"),
-            aLocation, vrc);
+        return setError(E_FAIL,
+                        tr("Invalid image file location '%s' (%Rrc)"),
+                        aLocation.raw(),
+                        vrc);
 
     m.location = aLocation;
@@ -790 +791 @@
     {
         RTFILE file;
-        vrc = RTFileOpen (&file, Utf8Str (m.locationFull), RTFILE_O_READ);
+        vrc = RTFileOpen(&file, Utf8Str(m.locationFull).c_str(), RTFILE_O_READ);
         if (RT_SUCCESS(vrc))
         {
@@ -976 +977 @@
          * newly opened media so convert this into an error */
         if (!m.lastAccessError.isEmpty())
-            rc = setError (VBOX_E_FILE_ERROR, Utf8Str (m.lastAccessError));
+            rc = setError(VBOX_E_FILE_ERROR, Utf8Str(m.lastAccessError).c_str());
     }
 
@@ -995 +996 @@
  * @param aImageNode    Either <DVDImage> or <FloppyImage> settings node.
  */
-HRESULT ImageMediumBase::protectedInit (VirtualBox *aVirtualBox,
-                                        const settings::Key &aImageNode)
+HRESULT ImageMediumBase::protectedInit(VirtualBox *aVirtualBox,
+                                       const settings::Medium &data)
 {
     AssertReturn(aVirtualBox, E_INVALIDARG);
@@ -1018 +1019 @@
 
     /* required */
-    unconst(m.id) = aImageNode.value <Guid> ("uuid");
+    unconst(m.id) = data.uuid;
     /* required */
-    Bstr location = aImageNode.stringValue ("location");
-    rc = setLocation (location);
-    CheckComRCReturnRC(rc);
-    /* optional */
-    {
-        settings::Key descNode = aImageNode.findKey ("Description");
-        if (!descNode.isNull())
-            m.description = descNode.keyStringValue();
-    }
+    rc = setLocation(data.strLocation);
+    CheckComRCReturnRC (rc);
+
+    m.description = data.strDescription;
 
     LogFlowThisFunc(("m.locationFull='%ls', m.id={%RTuuid}\n",
@@ -1077 +1073 @@
  * @note Locks this object for reading.
  */
-HRESULT ImageMediumBase::saveSettings (settings::Key &aImagesNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aImagesNode.isNull(), E_FAIL);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this);
-
-    Key imageNode = aImagesNode.appendKey ("Image");
-    /* required */
-    imageNode.setValue <Guid> ("uuid", m.id);
-    /* required */
-    imageNode.setValue <Bstr> ("location", m.locationFull);
-    /* optional */
-    if (!m.description.isNull())
-    {
-        Key descNode = aImagesNode.createKey ("Description");
-        descNode.setKeyValue <Bstr> (m.description);
-    }
+HRESULT ImageMediumBase::saveSettings(settings::Medium &data)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    data.uuid = m.id;
+    data.strLocation = m.locationFull;
+    data.strDescription = m.description;
+
+    data.llChildren.clear();
 
     return S_OK;

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -897 +897 @@
  *  @note Locks this object for writing.
  */
-HRESULT NetworkAdapter::loadSettings (const settings::Key &aAdapterNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aAdapterNode.isNull(), E_FAIL);
-
+HRESULT NetworkAdapter::loadSettings(const settings::NetworkAdapter &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -921 +917 @@
     HRESULT rc = S_OK;
 
-    /* type (optional, defaults to Am79C970A) */
-    const char *adapterType = aAdapterNode.stringValue ("type");
-
-    if (strcmp (adapterType, "Am79C970A") == 0)
-        mData->mAdapterType = NetworkAdapterType_Am79C970A;
-    else if (strcmp (adapterType, "Am79C973") == 0)
-        mData->mAdapterType = NetworkAdapterType_Am79C973;
-    else if (strcmp (adapterType, "82540EM") == 0)
-        mData->mAdapterType = NetworkAdapterType_I82540EM;
-    else if (strcmp (adapterType, "82543GC") == 0)
-        mData->mAdapterType = NetworkAdapterType_I82543GC;
-    else if (strcmp (adapterType, "82545EM") == 0)
-        mData->mAdapterType = NetworkAdapterType_I82545EM;
-    else
-        ComAssertMsgFailedRet (("Invalid adapter type '%s'", adapterType),
-                               E_FAIL);
-
-    /* enabled (required) */
-    mData->mEnabled = aAdapterNode.value <bool> ("enabled");
+    mData->mAdapterType = data.type;
+    mData->mEnabled = data.fEnabled;
     /* MAC address (can be null) */
-    rc = COMSETTER(MACAddress) (Bstr (aAdapterNode.stringValue ("MACAddress")));
+    rc = COMSETTER(MACAddress)(Bstr(data.strMACAddress));
     CheckComRCReturnRC(rc);
     /* cable (required) */
-    mData->mCableConnected = aAdapterNode.value <bool> ("cable");
+    mData->mCableConnected = data.fCableConnected;
     /* line speed (defaults to 100 Mbps) */
-    mData->mLineSpeed = aAdapterNode.value <ULONG> ("speed");
+    mData->mLineSpeed = data.ulLineSpeed;
     /* tracing (defaults to false) */
-    mData->mTraceEnabled = aAdapterNode.value <bool> ("trace");
-    mData->mTraceFile = aAdapterNode.stringValue ("tracefile");
-
-    /* One of NAT, HostInerface, Internal or nothing */
-    Key attachmentNode;
-
-    if (!(attachmentNode = aAdapterNode.findKey ("NAT")).isNull())
-    {
-        /* NAT */
-
-        /* optional */
-        mData->mNATNetwork = attachmentNode.stringValue ("network");
-
-        rc = AttachToNAT();
-        CheckComRCReturnRC(rc);
-    }
-    else
-    if (!(attachmentNode = aAdapterNode.findKey ("HostInterface")).isNull() /* backwards compatibility */
-            || !(attachmentNode = aAdapterNode.findKey ("BridgedInterface")).isNull())
-    {
-        /* Host Interface Networking */
-
-        Bstr name = attachmentNode.stringValue ("name");
-        /* name can be empty, but not null */
-        ComAssertRet (!name.isNull(), E_FAIL);
-
-        rc = COMSETTER(HostInterface) (name);
-        CheckComRCReturnRC(rc);
-
-        rc = AttachToBridgedInterface();
-        CheckComRCReturnRC(rc);
-    }
-    else
-    if (!(attachmentNode = aAdapterNode.findKey ("InternalNetwork")).isNull())
-    {
-        /* Internal Networking */
-
-        /* required */
-        mData->mInternalNetwork = attachmentNode.stringValue ("name");
-        Assert (!mData->mInternalNetwork.isNull());
-
-        rc = AttachToInternalNetwork();
-        CheckComRCReturnRC(rc);
-    }
-    else
-    if (!(attachmentNode = aAdapterNode.findKey ("HostOnlyInterface")).isNull())
-    {
+    mData->mTraceEnabled = data.fTraceEnabled;
+    mData->mTraceFile = data.strTraceFile;
+
+    switch (data.mode)
+    {
+        case NetworkAttachmentType_NAT:
+            mData->mNATNetwork = data.strName;
+            rc = AttachToNAT();
+            CheckComRCReturnRC(rc);
+        break;
+
+        case NetworkAttachmentType_Bridged:
+            rc = COMSETTER(HostInterface)(Bstr(data.strName));
+            CheckComRCReturnRC(rc);
+            rc = AttachToBridgedInterface();
+            CheckComRCReturnRC(rc);
+        break;
+
+        case NetworkAttachmentType_Internal:
+            mData->mInternalNetwork = data.strName;
+            Assert(!mData->mInternalNetwork.isNull());
+
+            rc = AttachToInternalNetwork();
+            CheckComRCReturnRC(rc);
+        break;
+
+        case NetworkAttachmentType_HostOnly:
 #if defined(VBOX_WITH_NETFLT)
-        Bstr name = attachmentNode.stringValue ("name");
-        /* name can be empty, but not null */
-        ComAssertRet (!name.isNull(), E_FAIL);
-
-        rc = COMSETTER(HostInterface) (name);
-        CheckComRCReturnRC(rc);
+            rc = COMSETTER(HostInterface)(Bstr(data.strName));
+            CheckComRCReturnRC(rc);
 #endif
-
-        /* Host Interface Networking */
-        rc = AttachToHostOnlyInterface();
-        CheckComRCReturnRC(rc);
-    }
-    else
-    {
-        /* Adapter has no children */
-        rc = Detach();
-        CheckComRCReturnRC(rc);
+            rc = AttachToHostOnlyInterface();
+            CheckComRCReturnRC(rc);
+        break;
+
+        case NetworkAttachmentType_Null:
+            rc = Detach();
+            CheckComRCReturnRC(rc);
+        break;
     }
 
@@ -1027 +980 @@
  *  @note Locks this object for reading.
  */
-HRESULT NetworkAdapter::saveSettings (settings::Key &aAdapterNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aAdapterNode.isNull(), E_FAIL);
-
+HRESULT NetworkAdapter::saveSettings(settings::NetworkAdapter &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -1038 +987 @@
     AutoReadLock alock(this);
 
-    aAdapterNode.setValue <bool> ("enabled", !!mData->mEnabled);
-    aAdapterNode.setValue <Bstr> ("MACAddress", mData->mMACAddress);
-    aAdapterNode.setValue <bool> ("cable", !!mData->mCableConnected);
-
-    aAdapterNode.setValue <ULONG> ("speed", mData->mLineSpeed);
-
-    if (mData->mTraceEnabled)
-        aAdapterNode.setValue <bool> ("trace", true);
-
-    aAdapterNode.setValueOr <Bstr> ("tracefile", mData->mTraceFile, Bstr::Null);
-
-    const char *typeStr = NULL;
-    switch (mData->mAdapterType)
-    {
-        case NetworkAdapterType_Am79C970A:
-            typeStr = "Am79C970A";
-            break;
-        case NetworkAdapterType_Am79C973:
-            typeStr = "Am79C973";
-            break;
-        case NetworkAdapterType_I82540EM:
-            typeStr = "82540EM";
-            break;
-        case NetworkAdapterType_I82543GC:
-            typeStr = "82543GC";
-            break;
-        case NetworkAdapterType_I82545EM:
-            typeStr = "82545EM";
-            break;
-        default:
-            ComAssertMsgFailedRet (("Invalid network adapter type: %d",
-                                    mData->mAdapterType),
-                                   E_FAIL);
-    }
-    aAdapterNode.setStringValue ("type", typeStr);
-
-    switch (mData->mAttachmentType)
+    data.fEnabled = !!mData->mEnabled;
+    data.strMACAddress = mData->mMACAddress;
+    data.fCableConnected = !!mData->mCableConnected;
+
+    data.ulLineSpeed = mData->mLineSpeed;
+
+    data.fTraceEnabled = mData->mTraceEnabled;
+
+    data.strTraceFile = mData->mTraceFile;
+
+    data.type = mData->mAdapterType;
+
+    switch (data.mode = mData->mAttachmentType)
     {
         case NetworkAttachmentType_Null:
-        {
-            /* do nothing -- empty content */
-            break;
-        }
+            data.strName.setNull();
+        break;
+
         case NetworkAttachmentType_NAT:
-        {
-            Key attachmentNode = aAdapterNode.createKey ("NAT");
-            if (!mData->mNATNetwork.isEmpty())
-                attachmentNode.setValue <Bstr> ("network",
-                                                mData->mNATNetwork);
-            break;
-        }
+            data.strName = mData->mNATNetwork;
+        break;
+
         case NetworkAttachmentType_Bridged:
-        {
-            Key attachmentNode = aAdapterNode.createKey ("BridgedInterface");
-            Assert (!mData->mHostInterface.isNull());
-            attachmentNode.setValue <Bstr> ("name", mData->mHostInterface);
-            break;
-        }
+            data.strName = mData->mHostInterface;
+        break;
+
         case NetworkAttachmentType_Internal:
-        {
-            Key attachmentNode = aAdapterNode.createKey ("InternalNetwork");
-            Assert (!mData->mInternalNetwork.isEmpty());
-            attachmentNode.setValue <Bstr> ("name", mData->mInternalNetwork);
-            break;
-        }
+            data.strName = mData->mInternalNetwork;
+        break;
+
         case NetworkAttachmentType_HostOnly:
-        {
-            Key attachmentNode = aAdapterNode.createKey ("HostOnlyInterface");
-#if defined(VBOX_WITH_NETFLT)
-            Assert (!mData->mHostInterface.isNull());
-            attachmentNode.setValue <Bstr> ("name", mData->mHostInterface);
-#endif
-            break;
-        }
-        default:
-        {
-            ComAssertFailedRet (E_FAIL);
-        }
+            data.strName = mData->mHostInterface;
+        break;
     }
 

trunk/src/VBox/Main/ParallelPortImpl.cpp

@@ -174 +174 @@
  *  @note Locks this object for writing.
  */
-HRESULT ParallelPort::loadSettings (const settings::Key &aPortNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aPortNode.isNull(), E_FAIL);
-
+HRESULT ParallelPort::loadSettings(const settings::ParallelPort &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -197 +193 @@
 
     /* enabled (required) */
-    mData->mEnabled = aPortNode.value <bool> ("enabled");
+    mData->mEnabled = data.fEnabled;
     /* I/O base (required) */
-    mData->mIOBase = aPortNode.value <ULONG> ("IOBase");
+    mData->mIOBase = data.ulIOBase;
     /* IRQ (required) */
-    mData->mIRQ = aPortNode.value <ULONG> ("IRQ");
+    mData->mIRQ = data.ulIRQ;
     /* device path (optional, defaults to null) */
-    Bstr path = aPortNode.stringValue ("path");
-
+    Bstr path(data.strPath);
     HRESULT rc = checkSetPath (path);
     CheckComRCReturnRC(rc);
@@ -221 +216 @@
  *  @note Locks this object for reading.
  */
-HRESULT ParallelPort::saveSettings (settings::Key &aPortNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aPortNode.isNull(), E_FAIL);
-
+HRESULT ParallelPort::saveSettings(settings::ParallelPort &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -232 +223 @@
     AutoReadLock alock(this);
 
-    aPortNode.setValue <bool> ("enabled", !!mData->mEnabled);
-    aPortNode.setValue <ULONG> ("IOBase", mData->mIOBase, 16);
-    aPortNode.setValue <ULONG> ("IRQ", mData->mIRQ);
-
-    /* 'path' is optional in XML */
-    if (!mData->mPath.isEmpty())
-        aPortNode.setValue <Bstr> ("path", mData->mPath);
+    data.fEnabled = !!mData->mEnabled;
+    data.ulIOBase = mData->mIOBase;
+    data.ulIRQ = mData->mIRQ;
+    data.strPath = mData->mPath;
 
     return S_OK;

trunk/src/VBox/Main/Performance.cpp

@@ -477 +477 @@
         {
             for (size_t i = 0; i < nameArray.size(); ++i)
-                processMetricList(std::string(com::Utf8Str(nameArray[i])), ComPtr<IUnknown>());
+                processMetricList(com::Utf8Str(nameArray[i]), ComPtr<IUnknown>());
         }
         else
-            processMetricList(std::string("*"), ComPtr<IUnknown>());
+            processMetricList("*", ComPtr<IUnknown>());
     }
     else
@@ -488 +488 @@
             {
                 case 0:
-                    processMetricList(std::string("*"), objectArray[i]);
+                    processMetricList("*", objectArray[i]);
                     break;
                 case 1:
-                    processMetricList(std::string(com::Utf8Str(nameArray[0])), objectArray[i]);
+                    processMetricList(com::Utf8Str(nameArray[0]), objectArray[i]);
                     break;
                 default:
-                    processMetricList(std::string(com::Utf8Str(nameArray[i])), objectArray[i]);
+                    processMetricList(com::Utf8Str(nameArray[i]), objectArray[i]);
                     break;
             }
@@ -500 +500 @@
 }
 
-void Filter::processMetricList(const std::string &name, const ComPtr<IUnknown> object)
-{
-    std::string::size_type startPos = 0;
-
-    for (std::string::size_type pos = name.find(",");
+void Filter::processMetricList(const com::Utf8Str &name, const ComPtr<IUnknown> object)
+{
+    size_t startPos = 0;
+
+    for (size_t pos = name.find(",");
          pos != std::string::npos;
          pos = name.find(",", startPos))
     {
-        mElements.push_back(std::make_pair(object, name.substr(startPos, pos - startPos)));
+        mElements.push_back(std::make_pair(object, std::string(name.substr(startPos, pos - startPos).c_str())));
         startPos = pos + 1;
     }
-    mElements.push_back(std::make_pair(object, name.substr(startPos)));
+    mElements.push_back(std::make_pair(object, std::string(name.substr(startPos).c_str())));
 }
 

trunk/src/VBox/Main/SerialPortImpl.cpp

@@ -175 +175 @@
  *  @note Locks this object for writing.
  */
-HRESULT SerialPort::loadSettings (const settings::Key &aPortNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aPortNode.isNull(), E_FAIL);
-
+HRESULT SerialPort::loadSettings(const settings::SerialPort &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -198 +194 @@
 
     /* enabled (required) */
-    mData->mEnabled = aPortNode.value <bool> ("enabled");
+    mData->mEnabled = data.fEnabled;
     /* I/O base (required) */
-    mData->mIOBase = aPortNode.value <ULONG> ("IOBase");
+    mData->mIOBase = data.ulIOBase;
     /* IRQ (required) */
-    mData->mIRQ = aPortNode.value <ULONG> ("IRQ");
+    mData->mIRQ = data.ulIRQ;
     /* host mode (required) */
-    const char *mode = aPortNode.stringValue ("hostMode");
-    if (strcmp (mode, "RawFile") == 0)
-        mData->mHostMode = PortMode_RawFile;
-    else if (strcmp (mode, "HostPipe") == 0)
-        mData->mHostMode = PortMode_HostPipe;
-    else if (strcmp (mode, "HostDevice") == 0)
-        mData->mHostMode = PortMode_HostDevice;
-    else if (strcmp (mode, "Disconnected") == 0)
-        mData->mHostMode = PortMode_Disconnected;
-    else
-        ComAssertMsgFailedRet (("Invalid port mode '%s'", mode), E_FAIL);
+    mData->mHostMode = data.portMode;
 
     /* pipe/device path (optional, defaults to null) */
-    Bstr path = aPortNode.stringValue ("path");
-    HRESULT rc = checkSetPath (path);
+    Bstr path(data.strPath);
+    HRESULT rc = checkSetPath(path);
     CheckComRCReturnRC(rc);
     mData->mPath = path;
 
     /* server mode (optional, defaults to false) */
-    mData->mServer = aPortNode.value <bool> ("server");
+    mData->mServer = data.fServer;
 
     return S_OK;
@@ -237 +223 @@
  *  @note Locks this object for reading.
  */
-HRESULT SerialPort::saveSettings (settings::Key &aPortNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aPortNode.isNull(), E_FAIL);
-
+HRESULT SerialPort::saveSettings(settings::SerialPort &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -248 +230 @@
     AutoReadLock alock(this);
 
-    aPortNode.setValue <bool> ("enabled", !!mData->mEnabled);
-    aPortNode.setValue <ULONG> ("IOBase", mData->mIOBase, 16);
-    aPortNode.setValue <ULONG> ("IRQ", mData->mIRQ);
-
-    const char *mode = NULL;
-    switch (mData->mHostMode)
-    {
-        case PortMode_Disconnected:
-            mode = "Disconnected";
-            break;
-        case PortMode_HostPipe:
-            mode = "HostPipe";
-            break;
-        case PortMode_HostDevice:
-            mode = "HostDevice";
-            break;
-        case PortMode_RawFile:
-            mode = "RawFile";
-            break;
-        default:
-            ComAssertMsgFailedRet (("Invalid serial port mode: %d",
-                                    mData->mHostMode),
-                                   E_FAIL);
-    }
-    aPortNode.setStringValue ("hostMode", mode);
+    data.fEnabled = !!mData->mEnabled;
+    data.ulIOBase = mData->mIOBase;
+    data.ulIRQ = mData->mIRQ;
+    data.portMode = mData->mHostMode;
 
     /* Always save non-null mPath and mServer to preserve the user values for
      * later use. Note that 'server' is false by default in XML so we don't
      * save it when it's false. */
-    if (!mData->mPath.isEmpty())
-        aPortNode.setValue <Bstr> ("path", mData->mPath);
-    if (mData->mServer)
-        aPortNode.setValue <bool> ("server", !!mData->mServer);
+    data.strPath = mData->mPath;
+    data.fServer = !!mData->mServer;
 
     return S_OK;

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -207 +207 @@
     /* Check whether the path is full (absolute) */
     char hostPathFull [RTPATH_MAX];
-    int vrc = RTPathAbsEx (NULL, hostPath,
-                           hostPathFull, sizeof (hostPathFull));
+    int vrc = RTPathAbsEx(NULL,
+                          hostPath.c_str(),
+                          hostPathFull,
+                          sizeof (hostPathFull));
     if (RT_FAILURE(vrc))
         return setError (E_INVALIDARG,
             tr ("Invalid shared folder path: '%s' (%Rrc)"), hostPath.raw(), vrc);
 
-    if (RTPathCompare (hostPath, hostPathFull) != 0)
+    if (RTPathCompare(hostPath.c_str(), hostPathFull) != 0)
         return setError (E_INVALIDARG,
             tr ("Shared folder path '%s' is not absolute"), hostPath.raw());
@@ -291 +293 @@
 
     /* check whether the host path exists */
-    Utf8Str hostPath = Utf8Str (m.hostPath);
-    char hostPathFull [RTPATH_MAX];
-    int vrc = RTPathExists (hostPath) ? RTPathReal (hostPath, hostPathFull,
-                                                    sizeof (hostPathFull))
+    Utf8Str hostPath = Utf8Str(m.hostPath);
+    char hostPathFull[RTPATH_MAX];
+    int vrc = RTPathExists(hostPath.c_str()) ? RTPathReal(hostPath.c_str(),
+                                                          hostPathFull,
+                                                          sizeof(hostPathFull))
                                       : VERR_PATH_NOT_FOUND;
     if (RT_SUCCESS(vrc))

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -48 +48 @@
     {}
 
-    Guid                        id;
-    Bstr                        name;
-    Bstr                        description;
+    Guid                        uuid;
+    Utf8Str                     strName;
+    Utf8Str                     strDescription;
     RTTIMESPEC                  timeStamp;
     ComObjPtr<SnapshotMachine>  pMachine;
@@ -84 +84 @@
 HRESULT Snapshot::init(VirtualBox *aVirtualBox,
                        const Guid &aId,
-                       IN_BSTR aName,
-                       IN_BSTR aDescription,
-                       RTTIMESPEC aTimeStamp,
+                       const Utf8Str &aName,
+                       const Utf8Str &aDescription,
+                       const RTTIMESPEC &aTimeStamp,
                        SnapshotMachine *aMachine,
                        Snapshot *aParent)
 {
-    LogFlowMember (("Snapshot::init(aParent=%p)\n", aParent));
-
-    ComAssertRet (!aId.isEmpty() && aName && aMachine, E_INVALIDARG);
+    LogFlowMember(("Snapshot::init(uuid: %s, aParent->uuid=%s)\n", aId.toString().c_str(), (aParent) ? aParent->m->uuid.toString().c_str() : ""));
+
+    ComAssertRet (!aId.isEmpty() && !aName.isEmpty() && aMachine, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -105 +105 @@
     mParent = aParent;
 
-    m->id = aId;
-    m->name = aName;
-    m->description = aDescription;
+    m->uuid = aId;
+    m->strName = aName;
+    m->strDescription = aDescription;
     m->timeStamp = aTimeStamp;
     m->pMachine = aMachine;
@@ -253 +253 @@
     AutoReadLock alock(this);
 
-    m->id.toUtf16().cloneTo(aId);
+    m->uuid.toUtf16().cloneTo(aId);
     return S_OK;
 }
@@ -266 +266 @@
     AutoReadLock alock(this);
 
-    m->name.cloneTo(aName);
+    m->strName.cloneTo(aName);
     return S_OK;
 }
@@ -274 +274 @@
  *  (see its lock requirements).
  */
-STDMETHODIMP Snapshot::COMSETTER(Name) (IN_BSTR aName)
+STDMETHODIMP Snapshot::COMSETTER(Name)(IN_BSTR aName)
 {
     CheckComArgNotNull(aName);
@@ -281 +281 @@
     CheckComRCReturnRC(autoCaller.rc());
 
+    Utf8Str strName(aName);
+
     AutoWriteLock alock(this);
 
-    if (m->name != aName)
-    {
-        m->name = aName;
+    if (m->strName != strName)
+    {
+        m->strName = strName;
 
         alock.leave(); /* Important! (child->parent locks are forbidden) */
@@ -304 +306 @@
     AutoReadLock alock(this);
 
-    m->description.cloneTo(aDescription);
+    m->strDescription.cloneTo(aDescription);
     return S_OK;
 }
@@ -315 +317 @@
     CheckComRCReturnRC(autoCaller.rc());
 
+    Utf8Str strDescription(aDescription);
+
     AutoWriteLock alock(this);
 
-    if (m->description != aDescription)
-    {
-        m->description = aDescription;
+    if (m->strDescription != strDescription)
+    {
+        m->strDescription = strDescription;
 
         alock.leave(); /* Important! (child->parent locks are forbidden) */
@@ -475 +479 @@
 Guid Snapshot::getId() const
 {
-    return m->id;
+    return m->uuid;
 }
 
@@ -483 +487 @@
  * @return
  */
-Bstr Snapshot::getName() const
-{
-    return m->name;
+const Utf8Str& Snapshot::getName() const
+{
+    return m->strName;
 }
 
@@ -512 +516 @@
     AutoReadLock alock(this);
 
-    if (m->id == aId)
+    if (m->uuid == aId)
         child = this;
     else
@@ -535 +539 @@
  *  Caller must hold the snapshots tree lock!
  */
-ComObjPtr<Snapshot> Snapshot::findChildOrSelf(IN_BSTR aName)
+ComObjPtr<Snapshot> Snapshot::findChildOrSelf(const Utf8Str &aName)
 {
     ComObjPtr<Snapshot> child;
-    AssertReturn(aName, child);
+    AssertReturn(!aName.isEmpty(), child);
 
     AutoCaller autoCaller(this);
     AssertComRC(autoCaller.rc());
 
-    AutoReadLock alock(this);
-
-    if (m->name == aName)
+    AutoReadLock alock (this);
+
+    if (m->strName == aName)
         child = this;
     else
@@ -572 +576 @@
 
     Utf8Str path = m->pMachine->mSSData->mStateFilePath;
-    LogFlowThisFunc(("Snap[%ls].statePath={%s}\n", m->name.raw(), path.raw()));
+    LogFlowThisFunc(("Snap[%s].statePath={%s}\n", m->strName.raw(), path.raw()));
 
     /* state file may be NULL (for offline snapshots) */
     if (    path.length()
-         && RTPathStartsWith(path, aOldPath)
+         && RTPathStartsWith(path.c_str(), aOldPath)
        )
     {
@@ -625 +629 @@
  * @return
  */
-HRESULT Snapshot::saveSnapshotImpl(settings::Key &aNode, bool aAttrsOnly)
-{
-    using namespace settings;
-
-    AutoReadLock alock(this);
-
-    /* uuid (required) */
-    if (!aAttrsOnly)
-        aNode.setValue<Guid>("uuid", m->id);
-
-    /* name (required) */
-    aNode.setValue<Bstr>("name", m->name);
-
-    /* timeStamp (required) */
-    aNode.setValue<RTTIMESPEC>("timeStamp", m->timeStamp);
-
-    /* Description node (optional) */
-    if (!m->description.isNull())
-    {
-        Key descNode = aNode.createKey("Description");
-        descNode.setKeyValue<Bstr>(m->description);
-    }
-    else
-    {
-        Key descNode = aNode.findKey ("Description");
-        if (!descNode.isNull())
-            descNode.zap();
-    }
+HRESULT Snapshot::saveSnapshotImpl(settings::Snapshot &data, bool aAttrsOnly)
+{
+    AutoReadLock alock(this);
+
+    data.uuid = m->uuid;
+    data.strName = m->strName;
+    data.timestamp = m->timeStamp;
+    data.strDescription = m->strDescription;
 
     if (aAttrsOnly)
@@ -663 +647 @@
         Utf8Str strStateFilePath = stateFilePath();
         m->pMachine->calculateRelativePath(strStateFilePath, strStateFilePath);
-        aNode.setStringValue ("stateFile", strStateFilePath);
-    }
-
-    {
-        ComObjPtr<SnapshotMachine> snapshotMachine = m->pMachine;
-
-        /* save hardware */
-        {
-            Key hwNode = aNode.createKey ("Hardware");
-            HRESULT rc = snapshotMachine->saveHardware(hwNode);
-            CheckComRCReturnRC(rc);
-        }
-
-        /* save hard disks. */
-        {
-            Key storageNode = aNode.createKey ("StorageControllers");
-            HRESULT rc = snapshotMachine->saveStorageControllers(storageNode);
-            CheckComRCReturnRC(rc);
-        }
-    }
+        data.strStateFile = strStateFilePath;
+    }
+    else
+        data.strStateFile.setNull();
+
+    HRESULT rc = m->pMachine->saveHardware(data.hardware);
+    CheckComRCReturnRC (rc);
+
+    rc = m->pMachine->saveStorageControllers(data.storage);
+    CheckComRCReturnRC (rc);
 
     alock.unlock();
 
+    data.llChildSnapshots.clear();
+
     if (m->llChildren.size())
     {
-        Key snapshotsNode = aNode.createKey ("Snapshots");
-
-        HRESULT rc = S_OK;
-
         for (SnapshotsList::const_iterator it = m->llChildren.begin();
              it != m->llChildren.end();
              ++it)
         {
-            Key snapshotNode = snapshotsNode.createKey("Snapshot");
-            rc = (*it)->saveSnapshotImpl(snapshotNode, aAttrsOnly);
-            CheckComRCReturnRC(rc);
+            settings::Snapshot snap;
+            rc = (*it)->saveSnapshotImpl(snap, aAttrsOnly);
+            CheckComRCReturnRC (rc);
+
+            data.llChildSnapshots.push_back(snap);
         }
     }
@@ -713 +687 @@
  *  @param aAttrsOnly   If true, only updatge user-changeable attrs.
  */
-HRESULT Snapshot::saveSnapshot(settings::Key &aNode, bool aAttrsOnly)
-{
-    AssertReturn(!aNode.isNull(), E_INVALIDARG);
-
+HRESULT Snapshot::saveSnapshot(settings::Snapshot &data, bool aAttrsOnly)
+{
     AutoWriteLock listLock(m->pMachine->snapshotsTreeLockHandle());
 
-    return saveSnapshotImpl(aNode, aAttrsOnly);
-}
-
+    return saveSnapshotImpl(data, aAttrsOnly);
+}
+

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -63 +63 @@
  * @param aName         Name of the storage controller.
  */
-HRESULT StorageController::init (Machine *aParent, IN_BSTR aName, 
-                                 StorageBus_T aStorageBus)
-{
-    LogFlowThisFunc(("aParent=%p aName=\"%ls\"\n", aParent, aName));
-
-    ComAssertRet (aParent && aName, E_INVALIDARG);
+HRESULT StorageController::init(Machine *aParent,
+                                const Utf8Str &aName,
+                                StorageBus_T aStorageBus)
+{
+    LogFlowThisFunc(("aParent=%p aName=\"%s\"\n", aParent, aName.raw()));
+
+    ComAssertRet(aParent && !aName.isEmpty(), E_INVALIDARG);
     if (   (aStorageBus <= StorageBus_Null)
         || (aStorageBus >  StorageBus_SCSI))
@@ -87 +88 @@
     mData.allocate();
 
-    mData->mName = aName;
+    mData->strName = aName;
     mData->mStorageBus = aStorageBus;
 
@@ -237 +238 @@
 
     /* mName is constant during life time, no need to lock */
-    mData.data()->mName.cloneTo(aName);
+    mData.data()->strName.cloneTo(aName);
 
     return S_OK;
@@ -461 +462 @@
         {
             /*
-             * The port count is fixed to 2. 
+             * The port count is fixed to 2.
              */
             if (aPortCount != 2)

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -77 +77 @@
     unconst(mParent) = aParent;
 
-    setDefaultMachineFolder (NULL);
-    setDefaultHardDiskFolder (NULL);
-    setDefaultHardDiskFormat (NULL);
-
-    setRemoteDisplayAuthLibrary (NULL);
+    setDefaultMachineFolder(Utf8Str::Null);
+    setDefaultHardDiskFolder(Utf8Str::Null);
+    setDefaultHardDiskFormat(Utf8Str::Null);
+
+    setRemoteDisplayAuthLibrary(Utf8Str::Null);
 
     mLogHistoryCount = 3;
@@ -362 +362 @@
     AutoReadLock alock(this);
 
-    mDefaultMachineFolderFull.cloneTo(aDefaultMachineFolder);
+    m_strDefaultMachineFolderFull.cloneTo(aDefaultMachineFolder);
 
     return S_OK;
@@ -391 +391 @@
     AutoReadLock alock(this);
 
-    mDefaultHardDiskFolderFull.cloneTo(aDefaultHardDiskFolder);
+    m_strDefaultHardDiskFolderFull.cloneTo(aDefaultHardDiskFolder);
 
     return S_OK;
@@ -437 +437 @@
     AutoReadLock alock(this);
 
-    mDefaultHardDiskFormat.cloneTo(aDefaultHardDiskFormat);
+    m_strDefaultHardDiskFormat.cloneTo(aDefaultHardDiskFormat);
 
     return S_OK;
@@ -466 +466 @@
     AutoReadLock alock(this);
 
-    mRemoteDisplayAuthLibrary.cloneTo(aRemoteDisplayAuthLibrary);
+    m_strRemoteDisplayAuthLibrary.cloneTo(aRemoteDisplayAuthLibrary);
 
     return S_OK;
@@ -495 +495 @@
     AutoReadLock alock(this);
 
-    mWebServiceAuthLibrary.cloneTo(aWebServiceAuthLibrary);
+    m_strWebServiceAuthLibrary.cloneTo(aWebServiceAuthLibrary);
 
     return S_OK;
@@ -563 +563 @@
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT SystemProperties::loadSettings (const settings::Key &aGlobal)
-{
-    using namespace settings;
-
+HRESULT SystemProperties::loadSettings(const settings::SystemProperties &data)
+{
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -572 +570 @@
     AutoWriteLock alock(this);
 
-    AssertReturn(!aGlobal.isNull(), E_FAIL);
-
     HRESULT rc = S_OK;
 
-    Key properties = aGlobal.key ("SystemProperties");
-
-    Bstr bstr;
-
-    bstr = properties.stringValue ("defaultMachineFolder");
-    rc = setDefaultMachineFolder (bstr);
+    rc = setDefaultMachineFolder(data.strDefaultMachineFolder);
     CheckComRCReturnRC(rc);
 
-    bstr = properties.stringValue ("defaultHardDiskFolder");
-    rc = setDefaultHardDiskFolder (bstr);
+    rc = setDefaultHardDiskFolder(data.strDefaultHardDiskFolder);
     CheckComRCReturnRC(rc);
 
-    bstr = properties.stringValue ("defaultHardDiskFormat");
-    rc = setDefaultHardDiskFormat (bstr);
+    rc = setDefaultHardDiskFormat(data.strDefaultHardDiskFormat);
     CheckComRCReturnRC(rc);
 
-    bstr = properties.stringValue ("remoteDisplayAuthLibrary");
-    rc = setRemoteDisplayAuthLibrary (bstr);
+    rc = setRemoteDisplayAuthLibrary(data.strRemoteDisplayAuthLibrary);
     CheckComRCReturnRC(rc);
 
-    bstr = properties.stringValue ("webServiceAuthLibrary");
-    rc = setWebServiceAuthLibrary (bstr);
+    rc = setWebServiceAuthLibrary(data.strWebServiceAuthLibrary);
     CheckComRCReturnRC(rc);
 
-    mLogHistoryCount = properties.valueOr <ULONG> ("LogHistoryCount", 3);
-
-    return S_OK;
-}
-
-HRESULT SystemProperties::saveSettings (settings::Key &aGlobal)
-{
-    using namespace settings;
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this);
-
-    ComAssertRet (!aGlobal.isNull(), E_FAIL);
-
-    /* first, delete the entry */
-    Key properties = aGlobal.findKey ("SystemProperties");
-    if (!properties.isNull())
-        properties.zap();
-    /* then, recreate it */
-    properties = aGlobal.createKey ("SystemProperties");
-
-    if (mDefaultMachineFolder)
-        properties.setValue <Bstr> ("defaultMachineFolder", mDefaultMachineFolder);
-
-    if (mDefaultHardDiskFolder)
-        properties.setValue <Bstr> ("defaultHardDiskFolder", mDefaultHardDiskFolder);
-
-    if (mDefaultHardDiskFormat)
-        properties.setValue <Bstr> ("defaultHardDiskFormat", mDefaultHardDiskFormat);
-
-    if (mRemoteDisplayAuthLibrary)
-        properties.setValue <Bstr> ("remoteDisplayAuthLibrary", mRemoteDisplayAuthLibrary);
-
-    if (mWebServiceAuthLibrary)
-        properties.setValue <Bstr> ("webServiceAuthLibrary", mWebServiceAuthLibrary);
-
-    properties.setValue <ULONG> ("LogHistoryCount", mLogHistoryCount);
+    mLogHistoryCount = data.ulLogHistoryCount;
+
+    return S_OK;
+}
+
+HRESULT SystemProperties::saveSettings(settings::SystemProperties &data)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    data.strDefaultMachineFolder = m_strDefaultMachineFolder;
+    data.strDefaultHardDiskFolder = m_strDefaultHardDiskFolder;
+    data.strDefaultHardDiskFormat = m_strDefaultHardDiskFormat;
+    data.strRemoteDisplayAuthLibrary = m_strRemoteDisplayAuthLibrary;
+    data.strWebServiceAuthLibrary = m_strWebServiceAuthLibrary;
+    data.ulLogHistoryCount = mLogHistoryCount;
 
     return S_OK;
@@ -678 +644 @@
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT SystemProperties::setDefaultMachineFolder (CBSTR aPath)
-{
-    Utf8Str path;
-    if (aPath && *aPath)
-        path = aPath;
-    else
+HRESULT SystemProperties::setDefaultMachineFolder(const Utf8Str &aPath)
+{
+    Utf8Str path(aPath);
+    if (path.isEmpty())
         path = "Machines";
 
     /* get the full file name */
     Utf8Str folder;
-    int vrc = mParent->calculateFullPath (path, folder);
+    int vrc = mParent->calculateFullPath(path, folder);
     if (RT_FAILURE(vrc))
-        return setError (E_FAIL,
-            tr ("Invalid default machine folder '%ls' (%Rrc)"),
-            path.raw(), vrc);
-
-    mDefaultMachineFolder = path;
-    mDefaultMachineFolderFull = folder;
-
-    return S_OK;
-}
-
-HRESULT SystemProperties::setDefaultHardDiskFolder (CBSTR aPath)
-{
-    Utf8Str path;
-    if (aPath && *aPath)
-        path = aPath;
-    else
+        return setError(E_FAIL,
+                        tr("Invalid default machine folder '%s' (%Rrc)"),
+                        path.raw(),
+                        vrc);
+
+    m_strDefaultMachineFolder = path;
+    m_strDefaultMachineFolderFull = folder;
+
+    return S_OK;
+}
+
+HRESULT SystemProperties::setDefaultHardDiskFolder(const Utf8Str &aPath)
+{
+    Utf8Str path(aPath);
+    if (path.isEmpty())
         path = "HardDisks";
 
     /* get the full file name */
     Utf8Str folder;
-    int vrc = mParent->calculateFullPath (path, folder);
+    int vrc = mParent->calculateFullPath(path, folder);
     if (RT_FAILURE(vrc))
-        return setError (E_FAIL,
-            tr ("Invalid default hard disk folder '%ls' (%Rrc)"),
-            path.raw(), vrc);
-
-    mDefaultHardDiskFolder = path;
-    mDefaultHardDiskFolderFull = folder;
-
-    return S_OK;
-}
-
-HRESULT SystemProperties::setDefaultHardDiskFormat (CBSTR aFormat)
-{
-    if (aFormat && *aFormat)
-        mDefaultHardDiskFormat = aFormat;
+        return setError(E_FAIL,
+                        tr("Invalid default hard disk folder '%s' (%Rrc)"),
+                        path.raw(),
+                        vrc);
+
+    m_strDefaultHardDiskFolder = path;
+    m_strDefaultHardDiskFolderFull = folder;
+
+    return S_OK;
+}
+
+HRESULT SystemProperties::setDefaultHardDiskFormat(const Utf8Str &aFormat)
+{
+    if (!aFormat.isEmpty())
+        m_strDefaultHardDiskFormat = aFormat;
     else
-        mDefaultHardDiskFormat = "VDI";
-
-    return S_OK;
-}
-
-HRESULT SystemProperties::setRemoteDisplayAuthLibrary (CBSTR aPath)
-{
-    if (aPath && *aPath)
-        mRemoteDisplayAuthLibrary = aPath;
+        m_strDefaultHardDiskFormat = "VDI";
+
+    return S_OK;
+}
+
+HRESULT SystemProperties::setRemoteDisplayAuthLibrary(const Utf8Str &aPath)
+{
+    if (!aPath.isEmpty())
+        m_strRemoteDisplayAuthLibrary = aPath;
     else
-        mRemoteDisplayAuthLibrary = "VRDPAuth";
-
-    return S_OK;
-}
-
-HRESULT SystemProperties::setWebServiceAuthLibrary (CBSTR aPath)
-{
-    if (aPath && *aPath)
-        mWebServiceAuthLibrary = aPath;
+        m_strRemoteDisplayAuthLibrary = "VRDPAuth";
+
+    return S_OK;
+}
+
+HRESULT SystemProperties::setWebServiceAuthLibrary(const Utf8Str &aPath)
+{
+    if (!aPath.isEmpty())
+        m_strWebServiceAuthLibrary = aPath;
     else
-        mWebServiceAuthLibrary = "VRDPAuth";
-
-    return S_OK;
-}
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
+        m_strWebServiceAuthLibrary = "VRDPAuth";
+
+    return S_OK;
+}
+

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -559 +559 @@
  *  @note Locks this object for writing.
  */
-HRESULT USBController::loadSettings (const settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT USBController::loadSettings(const settings::USBController &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -581 +577 @@
      * default to B. */
 
-    /* USB Controller node (required) */
-    Key controller = aMachineNode.key ("USBController");
-
-    /* enabled (required) */
-    mData->mEnabled = controller.value <bool> ("enabled");
-
-    /* enabledEhci (optiona, defaults to false) */
-    mData->mEnabledEhci = controller.value <bool> ("enabledEhci");
-
-#ifdef VBOX_WITH_USB
-    HRESULT rc = S_OK;
-
-    Key::List children = controller.keys ("DeviceFilter");
-    for (Key::List::const_iterator it = children.begin();
-         it != children.end(); ++ it)
-    {
-        /* required */
-        Bstr name = (*it).stringValue ("name");
-        bool active = (*it).value <bool> ("active");
-
-        /* optional */
-        Bstr vendorId = (*it).stringValue ("vendorId");
-        Bstr productId = (*it).stringValue ("productId");
-        Bstr revision = (*it).stringValue ("revision");
-        Bstr manufacturer = (*it).stringValue ("manufacturer");
-        Bstr product = (*it).stringValue ("product");
-        Bstr serialNumber = (*it).stringValue ("serialNumber");
-        Bstr port = (*it).stringValue ("port");
-        Bstr remote = (*it).stringValue ("remote");
-        ULONG maskedIfs = (*it).value <ULONG> ("maskedInterfaces");
-
-        ComObjPtr<USBDeviceFilter> filterObj;
-        filterObj.createObject();
-        rc = filterObj->init (this,
-                              name, active, vendorId, productId, revision,
-                              manufacturer, product, serialNumber,
-                              port, remote, maskedIfs);
-        /* error info is set by init() when appropriate */
+    mData->mEnabled = data.fEnabled;
+    mData->mEnabledEhci = data.fEnabledEHCI;
+
+#ifdef VBOX_WITH_USB
+    for (settings::USBDeviceFiltersList::const_iterator it = data.llDeviceFilters.begin();
+         it != data.llDeviceFilters.end();
+         ++it)
+    {
+        const settings::USBDeviceFilter &f = *it;
+        ComObjPtr<USBDeviceFilter> pFilter;
+        pFilter.createObject();
+        HRESULT rc = pFilter->init(this,        // parent
+                                   f);
         CheckComRCReturnRC(rc);
 
-        mDeviceFilters->push_back (filterObj);
-        filterObj->mInList = true;
+        mDeviceFilters->push_back(pFilter);
+        pFilter->mInList = true;
     }
 #endif /* VBOX_WITH_USB */
@@ -636 +607 @@
  *  @note Locks this object for reading.
  */
-HRESULT USBController::saveSettings (settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT USBController::saveSettings(settings::USBController &data)
+{
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -647 +614 @@
     AutoReadLock alock(this);
 
-    /* first, delete the entry */
-    Key controller = aMachineNode.findKey ("USBController");
-#ifdef VBOX_WITH_USB
-    if (!controller.isNull())
-        controller.zap();
-    /* then, recreate it */
-    controller = aMachineNode.createKey ("USBController");
-#else
-    /* don't zap it. */
-    if (controller.isNull())
-        controller = aMachineNode.createKey ("USBController");
-#endif
-
-    /* enabled */
-    controller.setValue <bool> ("enabled", !!mData->mEnabled);
-
-    /* enabledEhci */
-    controller.setValue <bool> ("enabledEhci", !!mData->mEnabledEhci);
-
-#ifdef VBOX_WITH_USB
-    DeviceFilterList::const_iterator it = mDeviceFilters->begin();
-    while (it != mDeviceFilters->end())
+    data.fEnabled = !!mData->mEnabled;
+    data.fEnabledEHCI = !!mData->mEnabledEhci;
+
+#ifdef VBOX_WITH_USB
+    data.llDeviceFilters.clear();
+
+    for (DeviceFilterList::const_iterator it = mDeviceFilters->begin();
+         it != mDeviceFilters->end();
+         ++it)
     {
         AutoWriteLock filterLock (*it);
         const USBDeviceFilter::Data &data = (*it)->data();
 
-        Key filter = controller.appendKey ("DeviceFilter");
-
-        filter.setValue <Bstr> ("name", data.mName);
-        filter.setValue <bool> ("active", !!data.mActive);
-
-        /* all are optional */
         Bstr str;
-        (*it)->COMGETTER (VendorId) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("vendorId", str);
-
-        (*it)->COMGETTER (ProductId) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("productId", str);
-
+
+        settings::USBDeviceFilter f;
+        f.strName = data.mName;
+        f.fActive = !!data.mActive;
+        (*it)->COMGETTER(VendorId)(str.asOutParam());
+        f.strVendorId = str;
+        (*it)->COMGETTER(ProductId)(str.asOutParam());
+        f.strProductId = str;
         (*it)->COMGETTER (Revision) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("revision", str);
-
+        f.strRevision = str;
         (*it)->COMGETTER (Manufacturer) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("manufacturer", str);
-
+        f.strManufacturer = str;
         (*it)->COMGETTER (Product) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("product", str);
-
+        f.strProduct = str;
         (*it)->COMGETTER (SerialNumber) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("serialNumber", str);
-
+        f.strSerialNumber = str;
         (*it)->COMGETTER (Port) (str.asOutParam());
-        if (!str.isNull())
-            filter.setValue <Bstr> ("port", str);
-
-        if (data.mRemote.string())
-            filter.setValue <Bstr> ("remote", data.mRemote.string());
-
-        if (data.mMaskedIfs)
-            filter.setValue <ULONG> ("maskedInterfaces", data.mMaskedIfs);
-
-        ++ it;
+        f.strPort = str;
+        f.strRemote = data.mRemote.string();
+        f.ulMaskedInterfaces = data.mMaskedIfs;
     }
 #endif /* VBOX_WITH_USB */
@@ -1215 +1148 @@
     ComAssertComRCRet (rc, false);
     if (!manufacturer.isNull())
-        USBFilterSetStringExact (&dev, USBFILTERIDX_MANUFACTURER_STR, Utf8Str(manufacturer), true);
+        USBFilterSetStringExact (&dev, USBFILTERIDX_MANUFACTURER_STR, Utf8Str(manufacturer).c_str(), true);
 
     Bstr product;
@@ -1221 +1154 @@
     ComAssertComRCRet (rc, false);
     if (!product.isNull())
-        USBFilterSetStringExact (&dev, USBFILTERIDX_PRODUCT_STR, Utf8Str(product), true);
+        USBFilterSetStringExact (&dev, USBFILTERIDX_PRODUCT_STR, Utf8Str(product).c_str(), true);
 
     Bstr serialNumber;
@@ -1227 +1160 @@
     ComAssertComRCRet (rc, false);
     if (!serialNumber.isNull())
-        USBFilterSetStringExact (&dev, USBFILTERIDX_SERIAL_NUMBER_STR, Utf8Str(serialNumber), true);
+        USBFilterSetStringExact (&dev, USBFILTERIDX_SERIAL_NUMBER_STR, Utf8Str(serialNumber).c_str(), true);
 
     Bstr address;

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -421 +421 @@
         {
             PCRTS3KEYENTRY pKeys = NULL;
-            vrc = RTS3GetBucketKeys(hS3, m->strBucket, &pKeys);
+            vrc = RTS3GetBucketKeys(hS3, m->strBucket.c_str(), &pKeys);
             if (RT_FAILURE(vrc))
                 throw setError(E_FAIL, tr ("Can't get keys for bucket (%Rrc)"), vrc);
@@ -623 +623 @@
         for (size_t a=0; a < sfaNames.size(); ++a)
         {
-            if (entry.name == RTPathFilename(Utf8Str(sfaNames[a])))
+            if (entry.name == RTPathFilename(Utf8Str(sfaNames[a]).c_str()))
             {
                 BSTR name;

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -26 +26 @@
 #include <iprt/string.h>
 #include <iprt/uuid.h>
+#include <iprt/stream.h>
 #include <iprt/thread.h>
 #include <iprt/process.h>
@@ -84 +85 @@
 /////////////////////////////////////////////////////////////////////////////
 
-static const char gDefaultGlobalConfig [] =
-{
-    "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" RTFILE_LINEFEED
-    "<!-- Sun VirtualBox Global Configuration -->" RTFILE_LINEFEED
-    "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" "
-        "version=\"" VBOX_XML_VERSION_FULL "\">" RTFILE_LINEFEED
-    "  <Global>"RTFILE_LINEFEED
-    "    <MachineRegistry/>"RTFILE_LINEFEED
-    "    <MediaRegistry/>"RTFILE_LINEFEED
-    "    <NetserviceRegistry>"RTFILE_LINEFEED
-    "       <DHCPServers>"RTFILE_LINEFEED
-    "          <DHCPServer "
-#ifdef RT_OS_WINDOWS
-                          "networkName=\"HostInterfaceNetworking-VirtualBox Host-Only Ethernet Adapter\" "
-#else
-                          "networkName=\"HostInterfaceNetworking-vboxnet0\" "
-#endif
-                          "IPAddress=\"192.168.56.100\" networkMask=\"255.255.255.0\" "
-                          "lowerIP=\"192.168.56.101\" upperIP=\"192.168.56.254\" "
-                          "enabled=\"1\"/>"RTFILE_LINEFEED
-    "       </DHCPServers>"RTFILE_LINEFEED
-    "    </NetserviceRegistry>"RTFILE_LINEFEED
-    "    <USBDeviceFilters/>"RTFILE_LINEFEED
-    "    <SystemProperties/>"RTFILE_LINEFEED
-    "  </Global>"RTFILE_LINEFEED
-    "</VirtualBox>"RTFILE_LINEFEED
-};
-
 // static
 Bstr VirtualBox::sVersion;
@@ -120 +93 @@
 // static
 Bstr VirtualBox::sPackageType;
-
-// static
-Bstr VirtualBox::sSettingsFormatVersion;
 
 // constructor / destructor
@@ -176 +146 @@
     LogFlowThisFunc(("Version: %ls, Package: %ls\n", sVersion.raw(), sPackageType.raw()));
 
-    if (sSettingsFormatVersion.isNull())
-        sSettingsFormatVersion = VBOX_XML_VERSION_FULL;
-    LogFlowThisFunc(("Settings Format Version: %ls\n",
-                      sSettingsFormatVersion.raw()));
-
     /* Get the VirtualBox home directory. */
     {
-        char homeDir [RTPATH_MAX];
-        int vrc = com::GetVBoxUserHomeDirectory (homeDir, sizeof (homeDir));
+        char homeDir[RTPATH_MAX];
+        int vrc = com::GetVBoxUserHomeDirectory(homeDir, sizeof(homeDir));
         if (RT_FAILURE(vrc))
             return setError (E_FAIL,
@@ -194 +159 @@
     }
 
-    /* compose the global config file name (always full path) */
-    Utf8StrFmt vboxConfigFile ("%s%c%s", mData.mHomeDir.raw(),
-                               RTPATH_DELIMITER, VBOX_GLOBAL_SETTINGS_FILE);
-
-    /* store the config file name */
-    unconst(mData.mCfgFile.mName) = vboxConfigFile;
-
-    /* lock the config file */
-    HRESULT rc = lockConfig();
-    if (SUCCEEDED(rc))
-    {
-        if (!isConfigLocked())
-        {
-            /*
-             *  This means the config file not found. This is not fatal --
-             *  we just create an empty one.
-             */
-            RTFILE handle = NIL_RTFILE;
-            int vrc = RTFileOpen (&handle, vboxConfigFile,
-                                  RTFILE_O_READWRITE | RTFILE_O_CREATE |
-                                  RTFILE_O_DENY_WRITE);
-            if (RT_SUCCESS(vrc))
-                vrc = RTFileWrite (handle,
-                                   (void *) gDefaultGlobalConfig,
-                                   strlen (gDefaultGlobalConfig), NULL);
-            if (RT_FAILURE(vrc))
+    /* compose the VirtualBox.xml file name */
+    unconst(m_strSettingsFilePath) = Utf8StrFmt("%s%c%s",
+                                                mData.mHomeDir.raw(),
+                                                RTPATH_DELIMITER,
+                                                VBOX_GLOBAL_SETTINGS_FILE);
+    HRESULT rc = S_OK;
+    try
+    {
+        // load and parse VirtualBox.xml; this will throw on XML or logic errors
+        m_pMainConfigFile = new settings::MainConfigFile(&m_strSettingsFilePath);
+
+        // either a) valid XML file loaded or b) file not found and defaults loaded:
+        // now construct our global objects from that data
+
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+        /* create the performance collector object BEFORE host */
+        unconst (mData.mPerformanceCollector).createObject();
+        rc = mData.mPerformanceCollector->init();
+        ComAssertComRCThrowRC(rc);
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
+        /* create the host object early, machines will need it */
+        unconst (mData.mHost).createObject();
+        rc = mData.mHost->init(this);
+        ComAssertComRCThrowRC(rc);
+
+        rc = mData.mHost->loadSettings(m_pMainConfigFile->host);
+        CheckComRCThrowRC(rc);
+
+        /* create the system properties object, someone may need it too */
+        unconst (mData.mSystemProperties).createObject();
+        rc = mData.mSystemProperties->init(this);
+        ComAssertComRCThrowRC (rc);
+
+        rc = mData.mSystemProperties->loadSettings(m_pMainConfigFile->systemProperties);
+        CheckComRCThrowRC(rc);
+
+        /* guest OS type objects, needed by machines */
+        for (size_t i = 0; i < RT_ELEMENTS (Global::sOSTypes); ++ i)
+        {
+            ComObjPtr <GuestOSType> guestOSTypeObj;
+            rc = guestOSTypeObj.createObject();
+            if (SUCCEEDED(rc))
             {
-                rc = setError (E_FAIL, tr ("Could not create the default settings file "
-                                           "'%s' (%Rrc)"),
-                                       vboxConfigFile.raw(), vrc);
+                rc = guestOSTypeObj->init(Global::sOSTypes [i].familyId,
+                                          Global::sOSTypes [i].familyDescription,
+                                          Global::sOSTypes [i].id,
+                                          Global::sOSTypes [i].description,
+                                          Global::sOSTypes [i].osType,
+                                          Global::sOSTypes [i].osHint,
+                                          Global::sOSTypes [i].recommendedRAM,
+                                          Global::sOSTypes [i].recommendedVRAM,
+                                          Global::sOSTypes [i].recommendedHDD,
+                                          Global::sOSTypes [i].networkAdapterType,
+                                          Global::sOSTypes [i].numSerialEnabled);
+                if (SUCCEEDED(rc))
+                    mData.mGuestOSTypes.push_back (guestOSTypeObj);
             }
-            else
-            {
-                mData.mCfgFile.mHandle = handle;
-                /* we do not close the file to simulate lockConfig() */
-            }
-        }
-    }
-
-    if (SUCCEEDED(rc))
-    {
-        try
-        {
-            using namespace settings;
-            using namespace xml;
-
-            /* no concurrent file access is possible in init() so open by handle */
-            File file (mData.mCfgFile.mHandle, vboxConfigFile);
-            XmlTreeBackend tree;
-
-            rc = VirtualBox::loadSettingsTree_FirstTime (tree, file,
-                                                         mData.mSettingsFileVersion);
-            CheckComRCThrowRC (rc);
-
-            Key global = tree.rootKey().key ("Global");
-
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-            /* create the performance collector object BEFORE host */
-            unconst(mData.mPerformanceCollector).createObject();
-            rc = mData.mPerformanceCollector->init();
             ComAssertComRCThrowRC (rc);
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
-            /* create the host object early, machines will need it */
-            unconst(mData.mHost).createObject();
-            rc = mData.mHost->init (this);
-            ComAssertComRCThrowRC (rc);
-
-            rc = mData.mHost->loadSettings (global);
-            CheckComRCThrowRC (rc);
-
-            /* create the system properties object, someone may need it too */
-            unconst(mData.mSystemProperties).createObject();
-            rc = mData.mSystemProperties->init (this);
-            ComAssertComRCThrowRC (rc);
-
-            rc = mData.mSystemProperties->loadSettings (global);
-            CheckComRCThrowRC (rc);
-
-            /* guest OS type objects, needed by machines */
-            for (size_t i = 0; i < RT_ELEMENTS (Global::sOSTypes); ++ i)
-            {
-                ComObjPtr<GuestOSType> guestOSTypeObj;
-                rc = guestOSTypeObj.createObject();
-                if (SUCCEEDED(rc))
-                {
-                    rc = guestOSTypeObj->init (Global::sOSTypes [i].familyId,
-                                               Global::sOSTypes [i].familyDescription,
-                                               Global::sOSTypes [i].id,
-                                               Global::sOSTypes [i].description,
-                                               Global::sOSTypes [i].osType,
-                                               Global::sOSTypes [i].osHint,
-                                               Global::sOSTypes [i].recommendedRAM,
-                                               Global::sOSTypes [i].recommendedVRAM,
-                                               Global::sOSTypes [i].recommendedHDD,
-                                               Global::sOSTypes [i].networkAdapterType,
-                                               Global::sOSTypes [i].numSerialEnabled);
-                    if (SUCCEEDED(rc))
-                        mData.mGuestOSTypes.push_back (guestOSTypeObj);
-                }
-                ComAssertComRCThrowRC (rc);
-            }
-
-            /* all registered media, needed by machines */
-            rc = loadMedia (global);
-            CheckComRCThrowRC (rc);
-
-            /* machines */
-            rc = loadMachines (global);
-            CheckComRCThrowRC (rc);
-
-            /* net services */
-            rc = loadNetservices(global);
-            CheckComRCThrowRC (rc);
-
-            /* check hard disk consistency */
-/// @todo (r=dmik) add IVirtualBox::cleanupHardDisks() instead or similar
-//            for (HardDiskList::const_iterator it = mData.mHardDisks.begin();
-//                 it != mData.mHardDisks.end() && SUCCEEDED(rc);
-//                 ++ it)
-//            {
-//                rc = (*it)->checkConsistency();
-//            }
-//            CheckComRCBreakRC ((rc));
-
-            /// @todo (dmik) if successful, check for orphan (unused) diffs
-            //  that might be left because of the server crash, and remove
-            //  Hmm, is it the same remark as above?..
-        }
-        catch (HRESULT err)
-        {
-            /* we assume that error info is set by the thrower */
-            rc = err;
-        }
-        catch (...)
-        {
-            rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
-        }
+        }
+
+        /* all registered media, needed by machines */
+        if (FAILED(rc = initMedia()))
+            throw rc;
+
+        /* machines */
+        if (FAILED(rc = initMachines()))
+            throw rc;
+
+        /* net services */
+        for (settings::DHCPServersList::const_iterator it = m_pMainConfigFile->llDhcpServers.begin();
+             it != m_pMainConfigFile->llDhcpServers.end();
+             ++it)
+        {
+            const settings::DHCPServer &data = *it;
+
+            ComObjPtr<DHCPServer> pDhcpServer;
+            if (SUCCEEDED(rc = pDhcpServer.createObject()))
+                rc = pDhcpServer->init(this, data);
+            CheckComRCThrowRC(rc);
+
+            rc = registerDHCPServer(pDhcpServer, false /* aSaveRegistry */);
+            CheckComRCThrowRC(rc);
+        }
+    }
+    catch (HRESULT err)
+    {
+        /* we assume that error info is set by the thrower */
+        rc = err;
+    }
+    catch (...)
+    {
+        rc = VirtualBox::handleUnexpectedExceptions(RT_SRC_POS);
     }
 
@@ -380 +300 @@
 }
 
+HRESULT VirtualBox::initMachines()
+{
+    for (settings::MachinesRegistry::const_iterator it = m_pMainConfigFile->llMachines.begin();
+         it != m_pMainConfigFile->llMachines.end();
+         ++it)
+    {
+        HRESULT rc = S_OK;
+        const settings::MachineRegistryEntry &xmlMachine = *it;
+        Guid uuid = xmlMachine.uuid;
+
+        ComObjPtr<Machine> pMachine;
+        if (SUCCEEDED(rc = pMachine.createObject()))
+        {
+            rc = pMachine->init(this,
+                                xmlMachine.strSettingsFile,
+                                Machine::Init_Registered,
+                                NULL,
+                                NULL,
+                                FALSE,
+                                &uuid);
+            if (SUCCEEDED(rc))
+                rc = registerMachine(pMachine);
+            if (FAILED(rc))
+                return rc;
+        }
+    }
+
+    return S_OK;
+}
+
+HRESULT VirtualBox::initMedia()
+{
+    HRESULT rc = S_OK;
+    settings::MediaList::const_iterator it;
+    for (it = m_pMainConfigFile->llHardDisks.begin();
+         it != m_pMainConfigFile->llHardDisks.end();
+         ++it)
+    {
+        const settings::Medium &xmlHD = *it;
+
+        ComObjPtr<HardDisk> pHardDisk;
+        if (SUCCEEDED(rc = pHardDisk.createObject()))
+            rc = pHardDisk->init(this,
+                                 NULL,           // parent
+                                 xmlHD);         // XML data; this recurses to processes the children
+        CheckComRCReturnRC(rc);
+
+        rc = registerHardDisk(pHardDisk, false /* aSaveRegistry */);
+        CheckComRCReturnRC(rc);
+    }
+
+    for (it = m_pMainConfigFile->llDvdImages.begin();
+         it != m_pMainConfigFile->llDvdImages.end();
+         ++it)
+    {
+        const settings::Medium &xmlDvd = *it;
+
+        ComObjPtr<DVDImage> pImage;
+        if (SUCCEEDED(pImage.createObject()))
+            rc = pImage->init(this, xmlDvd);
+        CheckComRCReturnRC(rc);
+
+        rc = registerDVDImage(pImage, false /* aSaveRegistry */);
+        CheckComRCReturnRC(rc);
+    }
+
+    for (it = m_pMainConfigFile->llFloppyImages.begin();
+         it != m_pMainConfigFile->llFloppyImages.end();
+         ++it)
+    {
+        const settings::Medium &xmlFloppy = *it;
+
+        ComObjPtr<FloppyImage> pImage;
+        if (SUCCEEDED(pImage.createObject()))
+            rc = pImage->init(this, xmlFloppy);
+        CheckComRCReturnRC(rc);
+
+        rc = registerFloppyImage(pImage, false /* aSaveRegistry */);
+        CheckComRCReturnRC(rc);
+    }
+
+    return S_OK;
+}
+
 void VirtualBox::uninit()
 {
@@ -442 +446 @@
     }
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
-    /* unlock the config file */
-    unlockConfig();
 
     LogFlowThisFunc(("Releasing callbacks...\n"));
@@ -575 +576 @@
 
     /* mCfgFile.mName is const and doesn't need a lock */
-    mData.mCfgFile.mName.cloneTo(aSettingsFilePath);
-    return S_OK;
-}
-
-STDMETHODIMP VirtualBox::
-COMGETTER(SettingsFileVersion) (BSTR *aSettingsFileVersion)
-{
-    CheckComArgNotNull(aSettingsFileVersion);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this);
-
-    mData.mSettingsFileVersion.cloneTo(aSettingsFileVersion);
-    return S_OK;
-}
-
-STDMETHODIMP VirtualBox::
-COMGETTER(SettingsFormatVersion) (BSTR *aSettingsFormatVersion)
-{
-    CheckComArgNotNull(aSettingsFormatVersion);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    sSettingsFormatVersion.cloneTo(aSettingsFormatVersion);
+    m_strSettingsFilePath.cloneTo(aSettingsFilePath);
     return S_OK;
 }
@@ -782 +757 @@
 
 /** @note Locks mSystemProperties object for reading. */
-STDMETHODIMP VirtualBox::CreateMachine (IN_BSTR aName,
-                                        IN_BSTR aOsTypeId,
-                                        IN_BSTR aBaseFolder,
-                                        IN_BSTR aId,
-                                        IMachine **aMachine)
+STDMETHODIMP VirtualBox::CreateMachine(IN_BSTR aName,
+                                       IN_BSTR aOsTypeId,
+                                       IN_BSTR aBaseFolder,
+                                       IN_BSTR aId,
+                                       IMachine **aMachine)
 {
     LogFlowThisFuncEnter();
@@ -805 +780 @@
      * machine folder will be used as a base folder.
      */
-    Bstr settingsFile = aBaseFolder;
-    if (settingsFile.isEmpty())
-    {
-        AutoReadLock propsLock (systemProperties());
+    Utf8Str strSettingsFile = aBaseFolder;
+    if (strSettingsFile.isEmpty())
         /* we use the non-full folder value below to keep the path relative */
-        settingsFile = systemProperties()->defaultMachineFolder();
-    }
-    settingsFile = Utf8StrFmt ("%ls%c%ls%c%ls.xml",
-                               settingsFile.raw(), RTPATH_DELIMITER,
-                               aName, RTPATH_DELIMITER, aName);
+        strSettingsFile = getDefaultMachineFolder();
+
+    strSettingsFile = Utf8StrFmt("%s%c%ls%c%ls.xml",
+                                 strSettingsFile.raw(),
+                                 RTPATH_DELIMITER,
+                                 aName,
+                                 RTPATH_DELIMITER,
+                                 aName);
 
     HRESULT rc = E_FAIL;
@@ -836 +812 @@
     {
         for (GuestOSTypeList::const_iterator it = mData.mGuestOSTypes.begin();
-             it != mData.mGuestOSTypes.end(); ++ it)
+             it != mData.mGuestOSTypes.end();
+             ++ it)
         {
             if ((*it)->id() == aOsTypeId)
@@ -846 +823 @@
 
         if (osType == NULL)
-            return setError (VBOX_E_OBJECT_NOT_FOUND,
-                tr ("Guest OS type '%ls' is invalid"), aOsTypeId);
+            return setError(VBOX_E_OBJECT_NOT_FOUND,
+                            tr("Guest OS type '%ls' is invalid"),
+                            aOsTypeId);
     }
 
     /* initialize the machine object */
-    rc = machine->init (this, settingsFile, Machine::Init_New, aName, osType,
-                        TRUE /* aNameSync */, &id);
+    rc = machine->init(this,
+                       strSettingsFile,
+                       Machine::Init_New,
+                       aName,
+                       osType,
+                       TRUE /* aNameSync */,
+                       &id);
     if (SUCCEEDED(rc))
     {
@@ -865 +848 @@
 }
 
-STDMETHODIMP VirtualBox::CreateLegacyMachine (IN_BSTR aName,
-                                              IN_BSTR aOsTypeId,
-                                              IN_BSTR aSettingsFile,
-                                              IN_BSTR aId,
-                                              IMachine **aMachine)
+STDMETHODIMP VirtualBox::CreateLegacyMachine(IN_BSTR aName,
+                                             IN_BSTR aOsTypeId,
+                                             IN_BSTR aSettingsFile,
+                                             IN_BSTR aId,
+                                             IMachine **aMachine)
 {
     CheckComArgStrNotEmptyOrNull (aName);
@@ -883 +866 @@
     Utf8Str settingsFile = aSettingsFile;
     /* append the default extension if none */
-    if (!RTPathHaveExt (settingsFile))
-        settingsFile = Utf8StrFmt ("%s.xml", settingsFile.raw());
+    if (!RTPathHaveExt(settingsFile.c_str()))
+        settingsFile = Utf8StrFmt("%s.xml", settingsFile.raw());
 
     /* create a new object */
@@ -919 +902 @@
 
     /* initialize the machine object */
-    rc = machine->init (this, Bstr (settingsFile), Machine::Init_New,
-                        aName, osType, FALSE /* aNameSync */, &id);
+    rc = machine->init(this,
+                       settingsFile,
+                       Machine::Init_New,
+                       aName,
+                       osType,
+                       FALSE /* aNameSync */,
+                       &id);
     if (SUCCEEDED(rc))
     {
@@ -931 +919 @@
 }
 
-STDMETHODIMP VirtualBox::OpenMachine (IN_BSTR aSettingsFile,
-                                      IMachine **aMachine)
+STDMETHODIMP VirtualBox::OpenMachine(IN_BSTR aSettingsFile,
+                                     IMachine **aMachine)
 {
     CheckComArgStrNotEmptyOrNull(aSettingsFile);
@@ -948 +936 @@
     {
         /* initialize the machine object */
-        rc = machine->init (this, aSettingsFile, Machine::Init_Existing);
+        rc = machine->init(this,
+                           aSettingsFile,
+                           Machine::Init_Import);
         if (SUCCEEDED(rc))
         {
@@ -1119 +1109 @@
     Bstr format = aFormat;
     if (format.isEmpty())
-    {
-        AutoReadLock propsLock (systemProperties());
-        format = systemProperties()->defaultHardDiskFormat();
-    }
+        format = getDefaultHardDiskFormat();
 
     HRESULT rc = E_FAIL;
@@ -1447 +1434 @@
  *  @note Locks this object for reading.
  */
-STDMETHODIMP VirtualBox::
-GetNextExtraDataKey (IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue)
-{
-    CheckComArgNotNull(aNextKey);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    /* start with nothing found */
-    Bstr("").cloneTo(aNextKey);
-    if (aNextValue)
-        Bstr("").cloneTo(aNextValue);
-
-    HRESULT rc = S_OK;
-
-    Bstr bstrInKey(aKey);
-
-    /* serialize file access (prevent writes) */
-    AutoReadLock alock(this);
-
-    try
-    {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file (we don't reuse the existing handle but
-         * request a new one to allow for concurrent multi-threaded reads) */
-        File file (File::Mode_Read, Utf8Str (mData.mCfgFile.mName));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_Again (tree, file);
-        CheckComRCReturnRC(rc);
-
-        Key globalNode = tree.rootKey().key ("Global");
-        Key extraDataNode = globalNode.findKey ("ExtraData");
-
-        if (!extraDataNode.isNull())
-        {
-            Key::List items = extraDataNode.keys ("ExtraDataItem");
-            if (items.size())
-            {
-                for (Key::List::const_iterator it = items.begin();
-                     it != items.end(); ++ it)
-                {
-                    Bstr key = (*it).stringValue ("name");
-
-                    /* if we're supposed to return the first one */
-                    if (bstrInKey.isEmpty())
-                    {
-                        key.cloneTo(aNextKey);
-                        if (aNextValue)
-                        {
-                            Bstr val = (*it).stringValue ("value");
-                            val.cloneTo(aNextValue);
-                        }
-                        return S_OK;
-                    }
-
-                    /* did we find the key we're looking for? */
-                    if (key == bstrInKey)
-                    {
-                        ++ it;
-                        /* is there another item? */
-                        if (it != items.end())
-                        {
-                            Bstr key = (*it).stringValue ("name");
-                            key.cloneTo(aNextKey);
-                            if (aNextValue)
-                            {
-                                Bstr val = (*it).stringValue ("value");
-                                val.cloneTo(aNextValue);
-                            }
-                        }
-                        /* else it's the last one, arguments are already NULL */
-                        return S_OK;
-                    }
-                }
-            }
-        }
-
-        /* Here we are when a) there are no items at all or b) there are items
-         * but none of them equals to the requested non-NULL key. b) is an
-         * error as well as a) if the key is non-NULL. When the key is NULL
-         * (which is the case only when there are no items), we just fall
-         * through to return NULLs and S_OK. */
-
-        if (!bstrInKey.isEmpty())
-            return setError (VBOX_E_OBJECT_NOT_FOUND,
-                tr("Could not find the extra data key '%ls'"), bstrInKey.raw());
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
-    }
-
-    return rc;
+STDMETHODIMP VirtualBox::GetExtraDataKeys(ComSafeArrayOut(BSTR, aKeys))
+{
+    using namespace settings;
+
+    if (ComSafeArrayOutIsNull(aKeys))
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    com::SafeArray<BSTR> saKeys(m_pMainConfigFile->mapExtraDataItems.size());
+    int i = 0;
+    for (ExtraDataItemsMap::const_iterator it = m_pMainConfigFile->mapExtraDataItems.begin();
+         it != m_pMainConfigFile->mapExtraDataItems.end();
+         ++it, ++i)
+    {
+        const Utf8Str &strName = it->first;     // the key
+        strName.cloneTo(&saKeys[i]);
+    }
+    saKeys.detachTo(ComSafeArrayOutArg(aKeys));
+
+    return S_OK;
 }
 
@@ -1548 +1463 @@
  *  @note Locks this object for reading.
  */
-STDMETHODIMP VirtualBox::GetExtraData (IN_BSTR aKey, BSTR *aValue)
+STDMETHODIMP VirtualBox::GetExtraData(IN_BSTR aKey,
+                                      BSTR *aValue)
 {
     CheckComArgNotNull(aKey);
@@ -1559 +1475 @@
     Bstr("").cloneTo(aValue);
 
-    HRESULT rc = S_OK;
-
-    /* serialize file access (prevent writes) */
-    AutoReadLock alock(this);
-
-    try
-    {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file (we don't reuse the existing handle but
-         * request a new one to allow for concurrent multi-threaded reads) */
-        File file (File::Mode_Read, Utf8Str (mData.mCfgFile.mName));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_Again (tree, file);
-        CheckComRCReturnRC(rc);
-
-        const Utf8Str key = aKey;
-
-        Key globalNode = tree.rootKey().key ("Global");
-        Key extraDataNode = globalNode.findKey ("ExtraData");
-
-        if (!extraDataNode.isNull())
-        {
-            /* check if the key exists */
-            Key::List items = extraDataNode.keys ("ExtraDataItem");
-            for (Key::List::const_iterator it = items.begin();
-                 it != items.end(); ++ it)
-            {
-                if (key == (*it).stringValue ("name"))
-                {
-                    Bstr val = (*it).stringValue ("value");
-                    val.cloneTo(aValue);
-                    break;
-                }
-            }
-        }
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
-    }
-
-    return rc;
+    settings::ExtraDataItemsMap::const_iterator it = m_pMainConfigFile->mapExtraDataItems.find(Utf8Str(aKey));
+    if (it != m_pMainConfigFile->mapExtraDataItems.end())
+    {
+        // found:
+        const Utf8Str &strValue = it->second;
+        strValue.cloneTo(aValue);
+    }
+
+    return S_OK;
 }
 
@@ -1609 +1489 @@
  *  @note Locks this object for writing.
  */
-STDMETHODIMP VirtualBox::SetExtraData (IN_BSTR aKey, IN_BSTR aValue)
+STDMETHODIMP VirtualBox::SetExtraData(IN_BSTR aKey,
+                                      IN_BSTR aValue)
 {
     CheckComArgNotNull(aKey);
@@ -1623 +1504 @@
         val = aValue;
 
-    bool changed = false;
-    HRESULT rc = S_OK;
+    Utf8Str strKey(aKey);
+    Bstr oldVal("");
 
     /* serialize file access (prevent concurrent reads and writes) */
     AutoWriteLock alock(this);
 
-    try
-    {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file */
-        File file (mData.mCfgFile.mHandle, Utf8Str (mData.mCfgFile.mName));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_ForUpdate (tree, file);
-        CheckComRCReturnRC(rc);
-
-        const Utf8Str key = aKey;
-        Bstr oldVal("");
-
-        Key globalNode = tree.rootKey().key ("Global");
-        Key extraDataNode = globalNode.createKey ("ExtraData");
-        Key extraDataItemNode;
-
-        Key::List items = extraDataNode.keys ("ExtraDataItem");
-        for (Key::List::const_iterator it = items.begin();
-             it != items.end(); ++ it)
-        {
-            if (key == (*it).stringValue ("name"))
-            {
-                extraDataItemNode = *it;
-                oldVal = (*it).stringValue ("value");
-                break;
-            }
-        }
-
-        /* When no key is found, oldVal is empty string */
-        changed = oldVal != val;
-
-        if (changed)
-        {
-            /* ask for permission from all listeners */
-            Bstr error;
-            if (!onExtraDataCanChange (Guid::Empty, aKey, val, error))
-            {
-                const char *sep = error.isEmpty() ? "" : ": ";
-                CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
-                LogWarningFunc (("Someone vetoed! Change refused%s%ls\n",
-                                 sep, err));
-                return setError (E_ACCESSDENIED,
-                    tr ("Could not set extra data because someone refused "
-                        "the requested change of '%ls' to '%ls'%s%ls"),
-                    aKey, val.raw(), sep, err);
-            }
-
-            if (!val.isEmpty())
-            {
-                if (extraDataItemNode.isNull())
-                {
-                    extraDataItemNode = extraDataNode.appendKey ("ExtraDataItem");
-                    extraDataItemNode.setStringValue ("name", key);
-                }
-                extraDataItemNode.setStringValue ("value", Utf8Str (aValue));
-            }
-            else
-            {
-                /* An old value does for sure exist here (XML schema
-                 * guarantees that "value" may not be absent in the
-                 * <ExtraDataItem> element). */
-                Assert (!extraDataItemNode.isNull());
-                extraDataItemNode.zap();
-            }
-
-            /* save settings on success */
-            rc = VirtualBox::saveSettingsTree (tree, file,
-                                               mData.mSettingsFileVersion);
-            CheckComRCReturnRC(rc);
-        }
-    }
-    catch (...)
-    {
-        rc = VirtualBox::handleUnexpectedExceptions (RT_SRC_POS);
+    settings::ExtraDataItemsMap::const_iterator it = m_pMainConfigFile->mapExtraDataItems.find(strKey);
+    if (it != m_pMainConfigFile->mapExtraDataItems.end())
+    {
+        // key exists:
+        const Utf8Str &strValue = it->second;
+        oldVal = strValue;
+    }
+
+    bool fChanged = (oldVal != val);
+    if (fChanged)
+    {
+        /* ask for permission from all listeners */
+        Bstr error;
+        if (!onExtraDataCanChange(Guid::Empty, aKey, val, error))
+        {
+            const char *sep = error.isEmpty() ? "" : ": ";
+            CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
+            LogWarningFunc(("Someone vetoed! Change refused%s%ls\n",
+                            sep, err));
+            return setError(E_ACCESSDENIED,
+                            tr("Could not set extra data because someone refused the requested change of '%ls' to '%ls'%s%ls"),
+                            aKey,
+                            val.raw(),
+                            sep,
+                            err);
+        }
+
+        m_pMainConfigFile->mapExtraDataItems[strKey] = val;
+
+        /* save settings on success */
+        HRESULT rc = saveSettings();
+        CheckComRCReturnRC (rc);
     }
 
     /* fire a notification */
-    if (SUCCEEDED(rc) && changed)
-        onExtraDataChange (Guid::Empty, aKey, aValue);
-
-    return rc;
+    if (fChanged)
+        onExtraDataChange(Guid::Empty, aKey, aValue);
+
+    return S_OK;
 }
 
@@ -1918 +1754 @@
 {
     ReturnComNotImplemented();
-}
-
-STDMETHODIMP VirtualBox::SaveSettings()
-{
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    return saveSettings();
-}
-
-STDMETHODIMP VirtualBox::SaveSettingsWithBackup (BSTR *aBakFileName)
-{
-    CheckComArgNotNull(aBakFileName);
-
-    AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    /* saveSettings() needs write lock */
-    AutoWriteLock alock(this);
-
-    /* perform backup only when there was auto-conversion */
-    if (mData.mSettingsFileVersion != VBOX_XML_VERSION_FULL)
-    {
-        Bstr bakFileName;
-
-        HRESULT rc = backupSettingsFile (mData.mCfgFile.mName,
-                                         mData.mSettingsFileVersion,
-                                         bakFileName);
-        CheckComRCReturnRC(rc);
-
-        bakFileName.cloneTo(aBakFileName);
-    }
-
-    return saveSettings();
 }
 
@@ -2718 +2520 @@
  * @note Locks this object and hard disk objects for reading.
  */
-HRESULT VirtualBox::
-findHardDisk(const Guid *aId, CBSTR aLocation,
-             bool aSetError, ComObjPtr<HardDisk> *aHardDisk /*= NULL*/)
+HRESULT VirtualBox::findHardDisk(const Guid *aId,
+                                 CBSTR aLocation,
+                                 bool aSetError,
+                                 ComObjPtr<HardDisk> *aHardDisk /*= NULL*/)
 {
     AssertReturn(aId || aLocation, E_INVALIDARG);
@@ -2750 +2553 @@
             const ComObjPtr<HardDisk> &hd = (*it).second;
 
-            HRESULT rc = hd->compareLocationTo (location, result);
+            HRESULT rc = hd->compareLocationTo(location, result);
             CheckComRCReturnRC(rc);
 
@@ -2767 +2570 @@
     {
         if (aId)
-            setError (rc, tr ("Could not find a hard disk with UUID {%RTuuid} "
-                              "in the media registry ('%ls')"),
-                      aId->raw(), mData.mCfgFile.mName.raw());
+            setError(rc,
+                     tr("Could not find a hard disk with UUID {%RTuuid} in the media registry ('%s')"),
+                     aId->raw(),
+                     m_strSettingsFilePath.raw());
         else
-            setError (rc, tr ("Could not find a hard disk with location '%ls' "
-                              "in the media registry ('%ls')"),
-                      aLocation, mData.mCfgFile.mName.raw());
+            setError(rc,
+                     tr("Could not find a hard disk with location '%ls' in the media registry ('%s')"),
+                     aLocation,
+                     m_strSettingsFilePath.raw());
     }
 
@@ -2794 +2599 @@
  * @note Locks this object and image objects for reading.
  */
-HRESULT VirtualBox::findDVDImage(const Guid *aId, CBSTR aLocation,
+HRESULT VirtualBox::findDVDImage(const Guid *aId,
+                                 CBSTR aLocation,
                                  bool aSetError,
                                  ComObjPtr<DVDImage> *aImage /* = NULL */)
@@ -2804 +2610 @@
     if (aLocation != NULL)
     {
-        int vrc = calculateFullPath (Utf8Str (aLocation), location);
+        int vrc = calculateFullPath(Utf8Str(aLocation), location);
         if (RT_FAILURE(vrc))
-            return setError (VBOX_E_FILE_ERROR,
-                tr ("Invalid image file location '%ls' (%Rrc)"),
-                aLocation, vrc);
+            return setError(VBOX_E_FILE_ERROR,
+                            tr("Invalid image file location '%ls' (%Rrc)"),
+                            aLocation,
+                            vrc);
     }
 
@@ -2824 +2631 @@
         found = (aId && (*it)->id() == *aId) ||
                 (aLocation != NULL &&
-                 RTPathCompare (location, Utf8Str ((*it)->locationFull())) == 0);
+                 RTPathCompare(location.c_str(),
+                               Utf8Str((*it)->locationFull()).c_str()
+                              ) == 0);
         if (found)
         {
@@ -2838 +2647 @@
     {
         if (aId)
-            setError (rc, tr ("Could not find a CD/DVD image with UUID {%RTuuid} "
-                              "in the media registry ('%ls')"),
-                      aId->raw(), mData.mCfgFile.mName.raw());
+            setError(rc,
+                     tr("Could not find a CD/DVD image with UUID {%RTuuid} in the media registry ('%s')"),
+                     aId->raw(),
+                     m_strSettingsFilePath.raw());
         else
-            setError (rc, tr ("Could not find a CD/DVD image with location '%ls' "
-                              "in the media registry ('%ls')"),
-                      aLocation, mData.mCfgFile.mName.raw());
+            setError(rc,
+                     tr("Could not find a CD/DVD image with location '%ls' in the media registry ('%s')"),
+                     aLocation,
+                     m_strSettingsFilePath.raw());
     }
 
@@ -2876 +2687 @@
     if (aLocation != NULL)
     {
-        int vrc = calculateFullPath (Utf8Str (aLocation), location);
+        int vrc = calculateFullPath(Utf8Str(aLocation), location);
         if (RT_FAILURE(vrc))
             return setError (VBOX_E_FILE_ERROR,
@@ -2896 +2707 @@
         found = (aId && (*it)->id() == *aId) ||
                 (aLocation != NULL &&
-                 RTPathCompare (location, Utf8Str ((*it)->locationFull())) == 0);
+                 RTPathCompare(location.c_str(),
+                               Utf8Str((*it)->locationFull()).c_str()
+                              ) == 0);
         if (found)
         {
@@ -2910 +2723 @@
     {
         if (aId)
-            setError (rc, tr ("Could not find a floppy image with UUID {%RTuuid} "
-                              "in the media registry ('%ls')"),
-                      aId->raw(), mData.mCfgFile.mName.raw());
+            setError(rc,
+                     tr("Could not find a floppy image with UUID {%RTuuid} in the media registry ('%s')"),
+                     aId->raw(),
+                     m_strSettingsFilePath.raw());
         else
-            setError (rc, tr ("Could not find a floppy image with location '%ls' "
-                              "in the media registry ('%ls')"),
-                      aLocation, mData.mCfgFile.mName.raw());
+            setError(rc,
+                     tr("Could not find a floppy image with location '%ls' in the media registry ('%s')"),
+                     aLocation,
+                     m_strSettingsFilePath.raw());
     }
 
     return rc;
+}
+
+/**
+ * Returns the default machine folder from the system properties
+ * with proper locking.
+ * @return
+ */
+const Utf8Str& VirtualBox::getDefaultMachineFolder() const
+{
+    AutoReadLock propsLock(mData.mSystemProperties);
+    return mData.mSystemProperties->m_strDefaultMachineFolder;
+}
+
+/**
+ * Returns the default hard disk folder from the system properties
+ * with proper locking.
+ * @return
+ */
+const Utf8Str& VirtualBox::getDefaultHardDiskFolder() const
+{
+    AutoReadLock propsLock(mData.mSystemProperties);
+    return mData.mSystemProperties->m_strDefaultHardDiskFolder;
+}
+
+/**
+ * Returns the default hard disk format from the system properties
+ * with proper locking.
+ * @return
+ */
+const Utf8Str& VirtualBox::getDefaultHardDiskFormat() const
+{
+    AutoReadLock propsLock(mData.mSystemProperties);
+    return mData.mSystemProperties->m_strDefaultHardDiskFormat;
 }
 
@@ -2933 +2781 @@
  * @note Doesn't lock any object.
  */
-int VirtualBox::calculateFullPath (const char *aPath, Utf8Str &aResult)
+int VirtualBox::calculateFullPath(const Utf8Str &strPath, Utf8Str &aResult)
 {
     AutoCaller autoCaller(this);
@@ -2940 +2788 @@
     /* no need to lock since mHomeDir is const */
 
-    char folder [RTPATH_MAX];
-    int vrc = RTPathAbsEx (mData.mHomeDir, aPath, folder, sizeof (folder));
+    char folder[RTPATH_MAX];
+    int vrc = RTPathAbsEx(mData.mHomeDir.c_str(), strPath.c_str(), folder, sizeof(folder));
     if (RT_SUCCESS(vrc))
         aResult = folder;
@@ -2959 +2807 @@
  * @note Doesn't lock any object.
  */
-void VirtualBox::calculateRelativePath (const char *aPath, Utf8Str &aResult)
+void VirtualBox::calculateRelativePath(const Utf8Str &strPath, Utf8Str &aResult)
 {
     AutoCaller autoCaller(this);
@@ -2968 +2816 @@
     Utf8Str settingsDir = mData.mHomeDir;
 
-    if (RTPathStartsWith (aPath, settingsDir))
+    if (RTPathStartsWith(strPath.c_str(), settingsDir.c_str()))
     {
         /* when assigning, we create a separate Utf8Str instance because both
@@ -2975 +2823 @@
          * first, and since its the same as aPath, an attempt to copy garbage
          * will be made. */
-        aResult = Utf8Str (aPath + settingsDir.length() + 1);
+        aResult = Utf8Str(strPath.c_str() + settingsDir.length() + 1);
     }
 }
@@ -3054 +2902 @@
 
 /**
- *  Reads in the machine definitions from the configuration loader
- *  and creates the relevant objects.
- *
- *  @param aGlobal  <Global> node.
- *
- *  @note Can be called only from #init().
- *  @note Doesn't lock anything.
- */
-HRESULT VirtualBox::loadMachines (const settings::Key &aGlobal)
-{
-    using namespace settings;
-
-    AutoCaller autoCaller(this);
-    AssertReturn(autoCaller.state() == InInit, E_FAIL);
-
-    HRESULT rc = S_OK;
-
-    Key::List machines = aGlobal.key ("MachineRegistry").keys ("MachineEntry");
-    for (Key::List::const_iterator it = machines.begin();
-         it != machines.end(); ++ it)
-    {
-        /* required */
-        Guid uuid = (*it).value <Guid> ("uuid");
-        /* required */
-        Bstr src = (*it).stringValue ("src");
-
-        /* create a new machine object */
-        ComObjPtr<Machine> machine;
-        rc = machine.createObject();
-        if (SUCCEEDED(rc))
-        {
-            /* initialize the machine object and register it */
-            rc = machine->init (this, src, Machine::Init_Registered,
-                                NULL, NULL, FALSE, &uuid);
-            if (SUCCEEDED(rc))
-                rc = registerMachine (machine);
-        }
-    }
-
-    return rc;
-}
-
-/**
- *  Reads in the media registration entries from the global settings file
- *  and creates the relevant objects.
- *
- *  @param aGlobal  <Global> node
- *
- *  @note Can be called only from #init().
- *  @note Doesn't lock anything.
- */
-HRESULT VirtualBox::loadMedia (const settings::Key &aGlobal)
-{
-    using namespace settings;
-
-    AutoCaller autoCaller(this);
-    AssertReturn(autoCaller.state() == InInit, E_FAIL);
-
-    HRESULT rc = S_OK;
-
-    Key registry = aGlobal.key ("MediaRegistry");
-
-    const char *kMediaNodes[] = { "HardDisks", "DVDImages", "FloppyImages" };
-
-    for (size_t n = 0; n < RT_ELEMENTS (kMediaNodes); ++ n)
-    {
-        /* All three media nodes are optional */
-        Key node = registry.findKey (kMediaNodes [n]);
-        if (node.isNull())
-            continue;
-
-        if (n == 0)
-        {
-            Key::List hardDisks = node.keys ("HardDisk");
-            for (Key::List::const_iterator it = hardDisks.begin();
-                 it != hardDisks.end(); ++ it)
-            {
-                ComObjPtr<HardDisk> hardDisk;
-                hardDisk.createObject();
-                rc = hardDisk->init(this, NULL, *it);
-                CheckComRCBreakRC (rc);
-
-                rc = registerHardDisk(hardDisk, false /* aSaveRegistry */);
-                CheckComRCBreakRC (rc);
-            }
-
-            continue;
-        }
-
-        CheckComRCBreakRC (rc);
-
-        Key::List images = node.keys ("Image");
-        for (Key::List::const_iterator it = images.begin();
-             it != images.end(); ++ it)
-        {
-            switch (n)
-            {
-                case 1: /* DVDImages */
-                {
-                    ComObjPtr<DVDImage> image;
-                    image.createObject();
-                    rc = image->init (this, *it);
-                    CheckComRCBreakRC (rc);
-
-                    rc = registerDVDImage (image, false /* aSaveRegistry */);
-                    CheckComRCBreakRC (rc);
-
-                    break;
-                }
-                case 2: /* FloppyImages */
-                {
-                    ComObjPtr<FloppyImage> image;
-                    image.createObject();
-                    rc = image->init (this, *it);
-                    CheckComRCBreakRC (rc);
-
-                    rc = registerFloppyImage (image, false /* aSaveRegistry */);
-                    CheckComRCBreakRC (rc);
-
-                    break;
-                }
-                default:
-                    AssertFailed();
-            }
-
-            CheckComRCBreakRC (rc);
-        }
-
-        CheckComRCBreakRC (rc);
-    }
-
-    return rc;
-}
-
-/**
- *  Reads in the network service registration entries from the global settings file
- *  and creates the relevant objects.
- *
- *  @param aGlobal  <Global> node
- *
- *  @note Can be called only from #init().
- *  @note Doesn't lock anything.
- */
-HRESULT VirtualBox::loadNetservices (const settings::Key &aGlobal)
-{
-    using namespace settings;
-
-    AutoCaller autoCaller(this);
-    AssertReturn(autoCaller.state() == InInit, E_FAIL);
-
-    HRESULT rc = S_OK;
-
-    Key registry = aGlobal.findKey ("NetserviceRegistry");
-    if(registry.isNull())
-        return S_OK;
-
-    const char *kMediaNodes[] = { "DHCPServers" };
-
-    for (size_t n = 0; n < RT_ELEMENTS (kMediaNodes); ++ n)
-    {
-        /* All three media nodes are optional */
-        Key node = registry.findKey (kMediaNodes [n]);
-        if (node.isNull())
-            continue;
-
-        if (n == 0)
-        {
-            Key::List dhcpServers = node.keys ("DHCPServer");
-            for (Key::List::const_iterator it = dhcpServers.begin();
-                 it != dhcpServers.end(); ++ it)
-            {
-                ComObjPtr<DHCPServer> dhcpServer;
-                dhcpServer.createObject();
-                rc = dhcpServer->init (this, *it);
-                CheckComRCBreakRC (rc);
-
-                rc = registerDHCPServer(dhcpServer, false /* aSaveRegistry */);
-                CheckComRCBreakRC (rc);
-            }
-
-            continue;
-        }
-    }
-   return rc;
-}
-
-/**
  *  Helper function to write out the configuration tree.
  *
@@ -3247 +2908 @@
 HRESULT VirtualBox::saveSettings()
 {
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
-
-    AssertReturn(!!mData.mCfgFile.mName, E_FAIL);
+    AutoCaller autoCaller (this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+
+    AssertReturn(!m_strSettingsFilePath.isEmpty(), E_FAIL);
 
     HRESULT rc = S_OK;
@@ -3259 +2920 @@
     try
     {
-        using namespace settings;
-        using namespace xml;
-
-        /* load the settings file */
-        File file (mData.mCfgFile.mHandle, Utf8Str (mData.mCfgFile.mName));
-        XmlTreeBackend tree;
-
-        rc = VirtualBox::loadSettingsTree_ForUpdate (tree, file);
-        CheckComRCThrowRC (rc);
-
-        Key global = tree.rootKey().createKey ("Global");
-
-        /* machines */
-        {
-            /* first, delete the entire machine registry */
-            Key registryNode = global.findKey ("MachineRegistry");
-            if (!registryNode.isNull())
-                registryNode.zap();
-            /* then, recreate it */
-            registryNode = global.createKey ("MachineRegistry");
-
-            /* write out the machines */
-            for (MachineList::iterator it = mData.mMachines.begin();
-                 it != mData.mMachines.end();
-                 ++ it)
-            {
-                Key entryNode = registryNode.appendKey ("MachineEntry");
-                rc = (*it)->saveRegistryEntry (entryNode);
-                CheckComRCThrowRC (rc);
-            }
-        }
-
-        /* media */
-        {
-            /* first, delete the entire media registry */
-            Key registryNode = global.findKey ("MediaRegistry");
-            if (!registryNode.isNull())
-                registryNode.zap();
-            /* then, recreate it */
-            registryNode = global.createKey ("MediaRegistry");
-
-            /* hard disks */
-            {
-                Key hardDisksNode = registryNode.createKey ("HardDisks");
-
-                for (HardDiskList::const_iterator it =
-                        mData.mHardDisks.begin();
-                     it != mData.mHardDisks.end();
-                     ++ it)
-                {
-                    rc = (*it)->saveSettings (hardDisksNode);
-                    CheckComRCThrowRC (rc);
-                }
-            }
-
-            /* CD/DVD images */
-            {
-                Key imagesNode = registryNode.createKey ("DVDImages");
-
-                for (DVDImageList::const_iterator it =
-                        mData.mDVDImages.begin();
-                     it != mData.mDVDImages.end();
-                     ++ it)
-                {
-                    rc = (*it)->saveSettings (imagesNode);
-                    CheckComRCThrowRC (rc);
-                }
-            }
-
-            /* floppy images */
-            {
-                Key imagesNode = registryNode.createKey ("FloppyImages");
-
-                for (FloppyImageList::const_iterator it =
-                        mData.mFloppyImages.begin();
-                     it != mData.mFloppyImages.end();
-                     ++ it)
-                {
-                    rc = (*it)->saveSettings (imagesNode);
-                    CheckComRCThrowRC (rc);
-                }
-            }
-        }
-
-        /* netservices */
-        {
-            /* first, delete the entire netservice registry */
-            Key registryNode = global.findKey ("NetserviceRegistry");
-            if (!registryNode.isNull())
-                registryNode.zap();
-            /* then, recreate it */
-            registryNode = global.createKey ("NetserviceRegistry");
-
-            /* hard disks */
-            {
-                Key dhcpServersNode = registryNode.createKey ("DHCPServers");
-
-                for (DHCPServerList::const_iterator it =
-                        mData.mDHCPServers.begin();
-                     it != mData.mDHCPServers.end();
-                     ++ it)
-                {
-                    rc = (*it)->saveSettings (dhcpServersNode);
-                    CheckComRCThrowRC (rc);
-                }
-            }
+        // machines
+        m_pMainConfigFile->llMachines.clear();
+        for (MachineList::iterator it = mData.mMachines.begin();
+             it != mData.mMachines.end();
+             ++it)
+        {
+            settings::MachineRegistryEntry mre;
+            rc = (*it)->saveRegistryEntry(mre);
+            m_pMainConfigFile->llMachines.push_back(mre);
+        }
+
+        // hard disks
+        m_pMainConfigFile->llHardDisks.clear();
+        for (HardDiskList::const_iterator it = mData.mHardDisks.begin();
+             it != mData.mHardDisks.end();
+             ++it)
+        {
+            settings::Medium m;
+            rc = (*it)->saveSettings(m);
+            m_pMainConfigFile->llHardDisks.push_back(m);
+            CheckComRCThrowRC(rc);
+        }
+
+        /* CD/DVD images */
+        m_pMainConfigFile->llDvdImages.clear();
+        for (DVDImageList::const_iterator it = mData.mDVDImages.begin();
+             it != mData.mDVDImages.end();
+             ++it)
+        {
+            settings::Medium m;
+            rc = (*it)->saveSettings(m);
+            CheckComRCThrowRC(rc);
+            m_pMainConfigFile->llDvdImages.push_back(m);
+        }
+
+        /* floppy images */
+        m_pMainConfigFile->llFloppyImages.clear();
+        for (FloppyImageList::const_iterator it = mData.mFloppyImages.begin();
+             it != mData.mFloppyImages.end();
+             ++it)
+        {
+            settings::Medium m;
+            rc = (*it)->saveSettings(m);
+            CheckComRCThrowRC(rc);
+            m_pMainConfigFile->llFloppyImages.push_back(m);
+        }
+
+        m_pMainConfigFile->llDhcpServers.clear();
+        for (DHCPServerList::const_iterator it =
+                mData.mDHCPServers.begin();
+                it != mData.mDHCPServers.end();
+                ++ it)
+        {
+            settings::DHCPServer d;
+            rc = (*it)->saveSettings(d);
+            CheckComRCThrowRC(rc);
+            m_pMainConfigFile->llDhcpServers.push_back(d);
         }
 
         /* host data (USB filters) */
-        rc = mData.mHost->saveSettings (global);
-        CheckComRCThrowRC (rc);
-
-        rc = mData.mSystemProperties->saveSettings (global);
-        CheckComRCThrowRC (rc);
-
-        /* save the settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file,
-                                           mData.mSettingsFileVersion);
-        CheckComRCThrowRC (rc);
+        rc = mData.mHost->saveSettings(m_pMainConfigFile->host);
+        CheckComRCThrowRC(rc);
+
+        rc = mData.mSystemProperties->saveSettings(m_pMainConfigFile->systemProperties);
+        CheckComRCThrowRC(rc);
+
+        // now write out the XML
+        m_pMainConfigFile->write();
     }
     catch (HRESULT err)
@@ -3444 +3054 @@
 
     /* add to the collection of registered machines */
-    mData.mMachines.push_back (aMachine);
+    mData.mMachines.push_back(aMachine);
 
     if (autoCaller.state() != InInit)
@@ -3491 +3101 @@
     {
         return setError(E_INVALIDARG,
-                        tr("Cannot register the hard disk '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%ls')"),
+                        tr("Cannot register the hard disk '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%s')"),
                         aHardDisk->locationFull().raw(),
                         aHardDisk->id().raw(),
                         strConflict.raw(),
-                        mData.mCfgFile.mName.raw());
+                        m_strSettingsFilePath.raw());
     }
 
@@ -3609 +3219 @@
     {
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("Cannot register the CD/DVD image '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%ls')"),
+                        tr("Cannot register the CD/DVD image '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%s')"),
                         aImage->locationFull().raw(),
                         aImage->id().raw(),
                         strConflict.raw(),
-                        mData.mCfgFile.mName.raw());
+                        m_strSettingsFilePath.raw());
     }
 
@@ -3712 +3322 @@
     {
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("Cannot register the floppy image '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%ls')"),
+                        tr("Cannot register the floppy image '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%s')"),
                         aImage->locationFull().raw(),
                         aImage->id().raw(),
                         strConflict.raw(),
-                        mData.mCfgFile.mName.raw());
+                        m_strSettingsFilePath.raw());
     }
 
@@ -3726 +3336 @@
         rc = saveSettings();
         if (FAILED (rc))
-            unregisterFloppyImage (aImage, false /* aSaveRegistry */);
+            unregisterFloppyImage(aImage, false /* aSaveRegistry */);
     }
 
@@ -3874 +3484 @@
  */
 /* static */
-HRESULT VirtualBox::ensureFilePathExists (const char *aFileName)
-{
-    Utf8Str strDir(aFileName);
+HRESULT VirtualBox::ensureFilePathExists(const Utf8Str &strFileName)
+{
+    Utf8Str strDir(strFileName);
     strDir.stripFilename();
-    if (!RTDirExists(strDir))
-    {
-        int vrc = RTDirCreateFullPath(strDir, 0777);
+    if (!RTDirExists(strDir.c_str()))
+    {
+        int vrc = RTDirCreateFullPath(strDir.c_str(), 0777);
         if (RT_FAILURE(vrc))
-        {
-            return setError (E_FAIL,
-                tr ("Could not create the directory '%s' (%Rrc)"),
-                strDir.c_str(), vrc);
-        }
-    }
-
-    return S_OK;
-}
-
-/**
- * Helper method to load the setting tree and turn expected exceptions into
- * COM errors, according to arguments.
- *
- * Note that this method will not catch unexpected errors so it may still
- * throw something.
- *
- * @param aTree             Tree to load into settings.
- * @param aFile             File to load settings from.
- * @param aValidate         @c @true to enable tree validation.
- * @param aCatchLoadErrors  @c true to catch exceptions caused by file
- *                          access or validation errors.
- * @param aAddDefaults      @c true to cause the substitution of default
- *                          values for missing attributes that have
- *                          defaults in the XML schema.
- * @param aFormatVersion    Where to store the current format version of the
- *                          loaded settings tree (optional, may be NULL).
- */
-/* static */
-HRESULT VirtualBox::loadSettingsTree (settings::XmlTreeBackend &aTree,
-                                      xml::File &aFile,
-                                      bool aValidate,
-                                      bool aCatchLoadErrors,
-                                      bool aAddDefaults,
-                                      Utf8Str *aFormatVersion /* = NULL */)
-{
-    using namespace settings;
-
-    try
-    {
-        SettingsTreeHelper helper = SettingsTreeHelper();
-
-        aTree.setInputResolver (helper);
-        aTree.setAutoConverter (helper);
-
-        aTree.read (aFile, aValidate ? VBOX_XML_SCHEMA : NULL,
-                    aAddDefaults ? XmlTreeBackend::Read_AddDefaults : 0);
-
-        aTree.resetAutoConverter();
-        aTree.resetInputResolver();
-
-        /* on success, memorize the current settings file version or set it to
-         * the most recent version if no settings conversion took place. Note
-         * that it's not necessary to do it every time we load the settings file
-         * (i.e. only loadSettingsTree_FirstTime() passes a non-NULL
-         * aFormatVersion value) because currently we keep the settings
-         * files locked so that the only legal way to change the format version
-         * while VirtualBox is running is saveSettingsTree(). */
-        if (aFormatVersion != NULL)
-        {
-            *aFormatVersion = aTree.oldVersion();
-            if (!aFormatVersion->length())
-                *aFormatVersion = VBOX_XML_VERSION_FULL;
-        }
-    }
-    catch (const xml::EIPRTFailure &err)
-    {
-        if (!aCatchLoadErrors)
-            throw;
-
-        return setError (VBOX_E_FILE_ERROR,
-                         tr ("Could not load the settings file '%s' (%Rrc)"),
-                         aFile.uri(), err.rc());
-    }
-    catch (const xml::RuntimeError &err)
-    {
-        Assert (err.what() != NULL);
-
-        if (!aCatchLoadErrors)
-            throw;
-
-        return setError (VBOX_E_XML_ERROR,
-                         tr ("Could not load the settings file '%s'.\n%s"),
-                         aFile.uri(),
-                         err.what() ? err.what() : "Unknown error");
-    }
-
-    return S_OK;
-}
-
-/**
- * Helper method to save the settings tree and turn expected exceptions to COM
- * errors.
- *
- * Note that this method will not catch unexpected errors so it may still
- * throw something.
- *
- * @param aTree             Tree to save.
- * @param aFile             File to save the tree to.
- * @param aFormatVersion    Where to store the (recent) format version of the
- *                          saved settings tree on success.
- */
-/* static */
-HRESULT VirtualBox::saveSettingsTree (settings::TreeBackend &aTree,
-                                      xml::File &aFile,
-                                      Utf8Str &aFormatVersion)
-{
-    using namespace settings;
-
-    try
-    {
-        aTree.write (aFile);
-
-        /* set the current settings file version to the most recent version on
-         * success. See also VirtualBox::loadSettingsTree(). */
-        if (aFormatVersion != VBOX_XML_VERSION_FULL)
-            aFormatVersion = VBOX_XML_VERSION_FULL;
-    }
-    catch (const xml::EIPRTFailure &err)
-    {
-        /* this is the only expected exception for now */
-        return setError (VBOX_E_FILE_ERROR,
-                         tr ("Could not save the settings file '%s' (%Rrc)"),
-                         aFile.uri(), err.rc());
-    }
-
-    return S_OK;
-}
-
-/**
- * Creates a backup copy of the given settings file by suffixing it with the
- * supplied version format string and optionally with numbers from .0 to .9
- * if the backup file already exists.
- *
- * @param aFileName     Original settings file name.
- * @param aOldFormat    Version of the original format.
- * @param aBakFileName  File name of the created backup copy (only on success).
- */
-/* static */
-HRESULT VirtualBox::backupSettingsFile (const Bstr &aFileName,
-                                        const Utf8Str &aOldFormat,
-                                        Bstr &aBakFileName)
-{
-    Utf8Str of = aFileName;
-    Utf8Str nf = Utf8StrFmt ("%s.%s.bak", of.raw(), aOldFormat.raw());
-
-    int vrc = RTFileCopyEx (of, nf, RTFILECOPY_FLAGS_NO_SRC_DENY_WRITE,
-                            NULL, NULL);
-
-    /* try progressive suffix from .0 to .9 on failure */
-    if (vrc == VERR_ALREADY_EXISTS)
-    {
-        Utf8Str tmp = nf;
-        for (int i = 0; i <= 9 && RT_FAILURE(vrc); ++ i)
-        {
-            nf = Utf8StrFmt ("%s.%d", tmp.raw(), i);
-            vrc = RTFileCopyEx (of, nf, RTFILECOPY_FLAGS_NO_SRC_DENY_WRITE,
-                                NULL, NULL);
-        }
-    }
-
-    if (RT_FAILURE(vrc))
-        return setError (VBOX_E_IPRT_ERROR,
-            tr ("Could not copy the settings file '%s' to '%s' (%Rrc)"),
-            of.raw(), nf.raw(), vrc);
-
-    aBakFileName = nf;
+            return setError(E_FAIL,
+                            tr("Could not create the directory '%s' (%Rrc)"),
+                            strDir.c_str(),
+                            vrc);
+    }
 
     return S_OK;
@@ -4076 +3524 @@
  */
 /* static */
-HRESULT VirtualBox::handleUnexpectedExceptions (RT_SRC_POS_DECL)
+HRESULT VirtualBox::handleUnexpectedExceptions(RT_SRC_POS_DECL)
 {
     try
@@ -4085 +3533 @@
     catch (const std::exception &err)
     {
-        ComAssertMsgFailedPos (("Unexpected exception '%s' (%s)",
-                                typeid (err).name(), err.what()),
-                               pszFile, iLine, pszFunction);
-        return E_FAIL;
+        return setError(E_FAIL, tr("Unexpected exception: %s [%s]\n%s[%d] (%s)"),
+                                err.what(), typeid(err).name(),
+                                pszFile, iLine, pszFunction);
     }
     catch (...)
     {
-        ComAssertMsgFailedPos (("Unknown exception"),
-                               pszFile, iLine, pszFunction);
-        return E_FAIL;
+        return setError(E_FAIL, tr("Unknown exception\n%s[%d] (%s)"),
+                                pszFile, iLine, pszFunction);
     }
 
@@ -4100 +3546 @@
     AssertFailed();
     return E_FAIL;
-}
-
-/**
- *  Helper to lock the VirtualBox configuration for write access.
- *
- *  @note This method is not thread safe (must be called only from #init()
- *  or #uninit()).
- *
- *  @note If the configuration file is not found, the method returns
- *  S_OK, but subsequent #isConfigLocked() will return FALSE. This is used
- *  in some places to determine the (valid) situation when no config file
- *  exists yet, and therefore a new one should be created from scratch.
- */
-HRESULT VirtualBox::lockConfig()
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
-    AssertReturn(autoCaller.state() == InInit, E_FAIL);
-
-    HRESULT rc = S_OK;
-
-    Assert (!isConfigLocked());
-    if (!isConfigLocked())
-    {
-        /* Open the associated config file. */
-        int vrc = RTFileOpen (&mData.mCfgFile.mHandle,
-                              Utf8Str (mData.mCfgFile.mName),
-                              RTFILE_O_READWRITE | RTFILE_O_OPEN |
-                              RTFILE_O_DENY_WRITE);
-        if (RT_FAILURE(vrc) && (vrc != VERR_FILE_NOT_FOUND))
-        {
-            /* Open the associated config file only with read access. */
-            vrc = RTFileOpen (&mData.mCfgFile.mHandle,
-                              Utf8Str (mData.mCfgFile.mName),
-                              RTFILE_O_READ | RTFILE_O_OPEN |
-                              RTFILE_O_DENY_NONE);
-            if (RT_FAILURE(vrc))
-            {
-                /* We even cannot open it in read mode, so there's seriously
-                   something wrong. */
-                rc = setError (E_FAIL,
-                        tr ("Could not even open settings file '%ls' in read mode (%Rrc)"),
-                        mData.mCfgFile.mName.raw(), vrc);
-            }
-            else
-            {
-                mData.mCfgFile.mReadonly = TRUE;
-            }
-        }
-        else
-        {
-            mData.mCfgFile.mReadonly = FALSE;
-        }
-
-        if (RT_FAILURE(vrc))
-        {
-            mData.mCfgFile.mHandle = NIL_RTFILE;
-            mData.mCfgFile.mReadonly = FALSE;
-        }
-
-        LogFlowThisFunc(("mCfgFile.mName='%ls', mCfgFile.mHandle=%d, rc=%08X\n",
-                          mData.mCfgFile.mName.raw(), mData.mCfgFile.mHandle, rc));
-    }
-    return rc;
-}
-
-/**
- *  Helper to unlock the VirtualBox configuration from write access.
- *
- *  @note This method is not thread safe (must be called only from #init()
- *  or #uninit()).
- */
-HRESULT VirtualBox::unlockConfig()
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), E_FAIL);
-    AssertReturn(autoCaller.state() == InUninit, E_FAIL);
-
-    HRESULT rc = S_OK;
-
-    if (isConfigLocked())
-    {
-        RTFileFlush (mData.mCfgFile.mHandle);
-        RTFileClose (mData.mCfgFile.mHandle);
-        /** @todo flush the directory too. */
-        mData.mCfgFile.mHandle = NIL_RTFILE;
-        mData.mCfgFile.mReadonly = FALSE;
-        LogFlowThisFunc(("\n"));
-    }
-
-    return rc;
 }
 
@@ -4793 +4148 @@
     {
         rc = (*it)->COMGETTER(NetworkName) (bstr.asOutParam());
-        CheckComRCThrowRC (rc);
+        CheckComRCThrowRC(rc);
 
         if(bstr == aName)

trunk/src/VBox/Main/VirtualBoxImplExtra.cpp

@@ -24 +24 @@
  */
 
-#include <VBox/settings.h>
-
-#include "VirtualBoxImpl.h"
-#include "VirtualBoxImplExtra.h"
-
-#include "VirtualBoxXMLUtil.h"
-
-/* embedded XML Schema documents for validating XML settings files */
-#include "xml_VirtualBox_settings_xsd.h"
-#include "xml_VirtualBox_settings_common_xsd.h"
-
-/* embedded settings converter template for updating settings files */
-#include "xml_SettingsConverter_xsl.h"
-
-/* embedded VirtualBox element definition that contains a proper 'version'
- * attribute constraint */
-static const unsigned char g_ab_xml_VirtualBox_settings_root_xsd[] =
-"<xsd:schema"
-"  xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-"  xmlns=\"http://www.innotek.de/VirtualBox-settings\""
-"  xmlns:vb=\"http://www.innotek.de/VirtualBox-settings\""
-"  targetNamespace=\"http://www.innotek.de/VirtualBox-settings\""
-"  elementFormDefault=\"qualified\""
-">"
-"<xsd:element name=\"VirtualBox\">"
-"  <xsd:complexType>"
-"    <xsd:complexContent>"
-"      <xsd:extension base=\"TVirtualBox\">"
-"        <xsd:attribute name=\"version\" type=\"xsd:token\" fixed=\"" VBOX_XML_VERSION_FULL "\" use=\"required\"/>"
-"      </xsd:extension>"
-"    </xsd:complexContent>"
-"  </xsd:complexType>"
-"</xsd:element>"
-"</xsd:schema>";
-
-static const unsigned g_cb_xml_VirtualBox_settings_root_xsd =
-    sizeof (g_ab_xml_VirtualBox_settings_root_xsd);
-
-/**
- * Resolves external entities while parting and validating XML settings files.
- *
- * @param aURI  URI of the external entity.
- * @param aID   ID of the external entity (may be NULL).
- *
- * @return      Input stream created using @c new or NULL to indicate
- *              a wrong URI/ID pair.
- */
-xml::Input *
-SettingsTreeHelper::resolveEntity (const char *aURI, const char * /* aID */)
-{
-    if (strcmp (aURI, VBOX_XML_SCHEMA_COMMON) == 0)
-    {
-        return new xml::
-            MemoryBuf ((const char *) g_ab_xml_VirtualBox_settings_common_xsd,
-                       g_cb_xml_VirtualBox_settings_common_xsd, aURI);
-    }
-
-    if (strcmp (aURI, VBOX_XML_SCHEMA_ROOT) == 0)
-    {
-        return new xml::
-            MemoryBuf ((const char *) g_ab_xml_VirtualBox_settings_root_xsd,
-                       g_cb_xml_VirtualBox_settings_root_xsd, aURI);
-    }
-
-    if (strcmp (aURI, VBOX_XML_SCHEMA) == 0)
-    {
-        return new xml::
-            MemoryBuf ((const char *) g_ab_xml_VirtualBox_settings_xsd,
-                       g_cb_xml_VirtualBox_settings_xsd, aURI);
-    }
-
-    if (strcmp (aURI, VBOX_XML_SETTINGS_CONVERTER) == 0)
-    {
-        return new xml::
-            MemoryBuf ((const char *) g_ab_xml_SettingsConverter_xsl,
-                       g_cb_xml_SettingsConverter_xsl, aURI);
-    }
-
-    AssertMsgFailed (("Unexpected entity: '%s' - knows: '%s' and '%s'\n", aURI,
-                      VBOX_XML_SCHEMA_COMMON, VBOX_XML_SCHEMA));
-    return NULL;
-}
-
-/**
- * Returns @true if the given tree needs to be converted using the XSLT
- * template identified by #templateUri(), or @false if no conversion is
- * required.
- *
- * The implementation normally checks for the "version" value of the
- * root key to determine if the conversion is necessary. When the
- * @a aOldVersion argument is not NULL, the implementation must return a
- * non-NULL non-empty string representing the old version (before
- * conversion) in it this string is used by XmlTreeBackend::oldVersion()
- * and must be non-NULL to indicate that the conversion has been
- * performed on the tree. The returned string must be allocated using
- * RTStrDup() or such.
- *
- * This method is called again after the successful transformation to
- * let the implementation retry the version check and request another
- * transformation if necessary. This may be used to perform multi-step
- * conversion like this: 1.1 => 1.2, 1.2 => 1.3 (instead of 1.1 => 1.3)
- * which saves from the need to update all previous conversion
- * templates to make each of them convert directly to the recent
- * version.
- *
- * @note Multi-step transformations are performed in a loop that exits
- *       only when this method returns @false. It's up to the
- *       implementation to detect cycling (repeated requests to convert
- *       from the same version) wrong version order, etc. and throw an
- *       EConversionCycle exception to break the loop without returning
- *       @false (which means the transformation succeeded).
- *
- * @param aRoot                 Root settings key.
- * @param aOldVersionString     Where to store old version string
- *                              pointer. May be NULL. Allocated memory is
- *                              freed by the caller using RTStrFree().
- */
-bool SettingsTreeHelper::
-needsConversion (const settings::Key &aRoot, char **aOldVersion) const
-{
-    if (strcmp (aRoot.name(), "VirtualBox") == 0)
-    {
-        const char *version = aRoot.stringValue ("version");
-        const char *dash = strchr (version, '-');
-        if (dash != NULL && strcmp (dash + 1, VBOX_XML_PLATFORM) == 0)
-        {
-            if (strcmp (version, VBOX_XML_VERSION_FULL) != 0)
-            {
-                /* version mismatch */
-                if (aOldVersion != NULL)
-                    *aOldVersion = RTStrDup (version);
-
-                return true;
-            }
-        }
-    }
-
-    /* either the tree is invalid, or it's the other platform, or it's the same
-     * version */
-    return false;
-}
-
-/**
- * Returns the URI of the XSLT template to perform the conversion.
- * This template will be applied to the tree if #needsConversion()
- * returns @c true for this tree.
- */
-const char* SettingsTreeHelper::templateUri() const
-{
-    return VBOX_XML_SETTINGS_CONVERTER;
-}
-
-#if defined VBOX_MAIN_SETTINGS_ADDONS
-
-// Settings API additions
-////////////////////////////////////////////////////////////////////////////////
-
-namespace settings
-{
-
-template<> stdx::char_auto_ptr
-ToString <com::Bstr> (const com::Bstr &aValue, unsigned int /* aExtra */)
-{
-    stdx::char_auto_ptr result;
-
-    if (aValue.raw() == NULL)
-        throw ENoValue();
-
-    /* The only way to cause RTUtf16ToUtf8Ex return a number of bytes needed
-     * w/o allocating the result buffer itself is to provide that both cch
-     * and *ppsz are not NULL. */
-    char dummy [1];
-    char *dummy2 = dummy;
-    size_t strLen = 1;
-
-    int vrc = RTUtf16ToUtf8Ex (aValue.raw(), RTSTR_MAX,
-                               &dummy2, strLen, &strLen);
-    if (RT_SUCCESS(vrc))
-    {
-        /* the string only contains '\0' :) */
-        result.reset (new char [1]);
-        result.get() [0] = '\0';
-        return result;
-    }
-
-    if (vrc == VERR_BUFFER_OVERFLOW)
-    {
-        result.reset (new char [strLen + 1]);
-        char *buf = result.get();
-        vrc = RTUtf16ToUtf8Ex (aValue.raw(), RTSTR_MAX, &buf, strLen + 1, NULL);
-    }
-
-    if (RT_FAILURE(vrc))
-        throw xml::LogicError (RT_SRC_POS);
-
-    return result;
-}
-
-template<> com::Guid FromString <com::Guid> (const char *aValue)
-{
-    if (aValue == NULL)
-        throw ENoValue();
-
-    /* For settings, the format is always {XXX...XXX} */
-    char buf [RTUUID_STR_LENGTH];
-    if (aValue == NULL || *aValue != '{' ||
-        strlen (aValue) != RTUUID_STR_LENGTH + 1 ||
-        aValue [RTUUID_STR_LENGTH] != '}')
-        throw ENoConversion(com::Utf8StrFmt("'%s' is not Guid", aValue));
-
-    /* strip { and } */
-    memcpy (buf, aValue + 1, RTUUID_STR_LENGTH - 1);
-    buf [RTUUID_STR_LENGTH - 1] = '\0';
-    /* we don't use Guid (const char *) because we want to throw
-     * ENoConversion on format error */
-    RTUUID uuid;
-    int vrc = RTUuidFromStr (&uuid, buf);
-    if (RT_FAILURE(vrc))
-        throw ENoConversion(com::Utf8StrFmt("'%s' is not Guid (%Rrc)", aValue, vrc));
-
-    return com::Guid (uuid);
-}
-
-template<> stdx::char_auto_ptr
-ToString <com::Guid> (const com::Guid &aValue, unsigned int /* aExtra */)
-{
-    /* For settings, the format is always {XXX...XXX} */
-    stdx::char_auto_ptr result (new char [RTUUID_STR_LENGTH + 2]);
-
-    int vrc = RTUuidToStr (aValue.raw(), result.get() + 1, RTUUID_STR_LENGTH);
-    if (RT_FAILURE(vrc))
-        throw xml::LogicError (RT_SRC_POS);
-
-    result.get() [0] = '{';
-    result.get() [RTUUID_STR_LENGTH] = '}';
-    result.get() [RTUUID_STR_LENGTH + 1] = '\0';
-
-    return result;
-}
-
-#endif // VBOX_MAIN_SETTINGS_ADDONS
-
-} /* namespace settings */
-
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/generic/NetIf-generic.cpp

@@ -80 +80 @@
     pIf->COMGETTER(Name)(interfaceName.asOutParam());
     Utf8Str strName(interfaceName);
-    return NetIfAdpCtl(strName, pszAddr, pszOption, pszMask);
+    return NetIfAdpCtl(strName.c_str(), pszAddr, pszOption, pszMask);
 }
 
@@ -242 +242 @@
             progress.queryInterfaceTo(aProgress);
             iface.queryInterfaceTo(aHostNetworkInterface);
-            rc = NetIfAdpCtl(Utf8Str(ifname), "remove", NULL, NULL);
+            rc = NetIfAdpCtl(Utf8Str(ifname).c_str(), "remove", NULL, NULL);
             if (RT_FAILURE(rc))
                 progress->notifyComplete(E_FAIL, COM_IIDOF(IHostNetworkInterface), HostNetworkInterface::getComponentName(), "Failed to execute '"VBOXNETADPCTL_NAME "' (exit status: %d)", rc);

trunk/src/VBox/Main/glue/SupportErrorInfo.cpp

@@ -98 +98 @@
  */
 /* static */
-HRESULT SupportErrorInfoBase::setErrorInternal (
-    HRESULT aResultCode, const GUID *aIID,
-    const char *aComponent, const char *aText,
-    bool aWarning, IVirtualBoxErrorInfo *aInfo /*= NULL*/)
+HRESULT SupportErrorInfoBase::setErrorInternal(HRESULT aResultCode,
+                                               const GUID *aIID,
+                                               const char *aComponent,
+                                               const Utf8Str &strText,
+                                               bool aWarning,
+                                               IVirtualBoxErrorInfo *aInfo /*= NULL*/)
 {
     /* whether multi-error mode is turned on */
     bool preserve = ((uintptr_t) RTTlsGet (MultiResult::sCounter)) > 0;
 
-    LogRel (("ERROR [COM]: aRC=%#08x aIID={%Vuuid} aComponent={%s} aText={%s} "
-             "aWarning=%RTbool, aInfo=%p, preserve=%RTbool\n",
-             aResultCode, aIID, aComponent, aText, aWarning, aInfo,
-             preserve));
+    LogRel(("ERROR [COM]: aRC=%#08x aIID={%Vuuid} aComponent={%s} aText={%s} aWarning=%RTbool, aInfo=%p, preserve=%RTbool\n",
+            aResultCode,
+            aIID,
+            aComponent,
+            strText.c_str(),
+            aWarning,
+            aInfo,
+            preserve));
 
     if (aInfo == NULL)
@@ -117 +123 @@
                       (aWarning && aResultCode != S_OK),
                       E_FAIL);
-        AssertReturn(aText != NULL, E_FAIL);
-        AssertReturn(*aText != '\0', E_FAIL);
+        AssertReturn(!strText.isEmpty(), E_FAIL);
 
         /* reset the error severity bit if it's a warning */
@@ -263 +268 @@
                 CheckComRCBreakRC (rc);
 
-                rc = infoObj->init (aResultCode, aIID, aComponent, aText, curInfo);
+                rc = infoObj->init(aResultCode, aIID, aComponent, strText, curInfo);
                 CheckComRCBreakRC (rc);
 
@@ -335 +340 @@
 }
 
+HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const Utf8Str &strText)
+{
+    HRESULT rc = setError(aResultCode,
+                          mainInterfaceID(),
+                          componentName(),
+                          strText);
+    return rc;
+}
+
 HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const char *aText, ...)
 {

trunk/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp

@@ -41 +41 @@
  * Initializes the error info object with the given error details.
  */
-HRESULT VirtualBoxErrorInfo::init (HRESULT aResultCode, const GUID *aIID,
-                                   const char *aComponent, const char *aText,
-                                   IVirtualBoxErrorInfo *aNext)
+HRESULT VirtualBoxErrorInfo::init(HRESULT aResultCode,
+                                  const GUID *aIID,
+                                  const char *aComponent,
+                                  const Utf8Str &strText,
+                                  IVirtualBoxErrorInfo *aNext)
 {
     mResultCode = aResultCode;
@@ -51 +53 @@
 
     mComponent = aComponent;
-    mText = aText;
+    mText = strText;
     mNext = aNext;
 

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

@@ -347 +347 @@
 
   <enum
+       name="SettingsVersion"
+       uuid="6e151282-c338-428a-989d-5f2402d87e6f"
+       >
+      <desc>
+          Settings version of VirtualBox settings files. This is written to
+          the "version" attribute of the root "VirtualBox" element in the settings
+          file XML and indicates which VirtualBox version wrote the file.
+      </desc>
+
+      <const name="Null"    value="0">
+          <desc>Null value, indicates invalid version.</desc>
+      </const>
+      <const name="v1_0"     value="1">
+          <desc>Settings version "1.0", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_1"     value="2">
+          <desc>Settings version "1.7", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_2"     value="3">
+          <desc>Settings version "1.2", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_3pre"  value="4">
+          <desc>Settings version "1.3pre", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_3"     value="5">
+          <desc>Settings version "1.3", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_4"     value="6">
+          <desc>Settings version "1.4", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_5"     value="7">
+          <desc>Settings version "1.5", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_6"     value="8">
+          <desc>Settings version "1.6", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_7"     value="9">
+          <desc>Settings version "1.7", understood by VirtualBox 3.0 and above.</desc>
+      </const>
+      <const name="v1_8"     value="10">
+          <desc>Settings version "1.8", understood by VirtualBox 3.1 and above.</desc>
+      </const>
+  </enum>
+
+  <enum
        name="AccessMode"
        uuid="1da0007c-ddf7-4be8-bcac-d84a1558785f"
@@ -1401 +1446 @@
     </attribute>
 
-    <attribute name="settingsFileVersion" type="wstring" readonly="yes">
-      <desc>
-        Current version of the format of the global VirtualBox settings file
-        (<tt>VirtualBox.xml</tt>).
-
-        The version string has the following format:
-        <pre>
-          x.y-platform
-        </pre>
-        where @c x and @c y are the major and the minor format
-        versions, and @c platform is the platform identifier.
-
-        The current version usually matches the value of the
-        <link to="#settingsFormatVersion"/> attribute unless the
-        settings file was created by an older version of VirtualBox and there
-        was a change of the settings file format since then.
-
-        Note that VirtualBox automatically converts settings files from older
-        versions to the most recent version when reading them (usually at
-        VirtualBox startup) but it doesn't save the changes back until
-        you call a method that implicitly saves settings (such as
-        <link to="#setExtraData"/>) or call <link to="#saveSettings"/>
-        explicitly. Therefore, if the value of this attribute differs from the
-        value of <link to="#settingsFormatVersion"/>, then it
-        means that the settings file was converted but the result of the
-        conversion is not yet saved to disk.
-
-        The above feature may be used by interactive front-ends to inform users
-        about the settings file format change and offer them to explicitly save
-        all converted settings files (the global and VM-specific ones),
-        optionally create backup copies of the old settings files before saving,
-        etc.
-
-        <see>settingsFormatVersion, saveSettingsWithBackup()</see>
-      </desc>
-    </attribute>
-
-    <attribute name="settingsFormatVersion" type="wstring" readonly="yes">
-      <desc>
-        Most recent version of the settings file format.
-
-        The version string has the following format:
-        <pre>
-          x.y-platform
-        </pre>
-        where @c x and @c y are the major and the minor format
-        versions, and @c platform is the platform identifier.
-
-        VirtualBox uses this version of the format when saving settings files
-        (either as a result of method calls that require to save settings or as
-        a result of an explicit call to <link to="#saveSettings"/>).
-
-        <see>settingsFileVersion</see>
-      </desc>
-    </attribute>
-
     <attribute name="host" type="IHost" readonly="yes">
       <desc>Associated host object.</desc>
@@ -2297 +2286 @@
     </method>
 
-    <method name="getNextExtraDataKey">
-      <desc>
-        Returns the global extra data key name following the supplied key.
-
-        An error is returned if the supplied @a key does not exist. An empty
-        string is returned in @a nextKey if the supplied key is the last key. When
-        supplying @c null or an empty string for the @a key, the first key item
-        is returned in @a nextKey (if there is any). @a nextValue is an optional
-        parameter and if supplied, the next key's value is returned in it.
-
-        <result name="VBOX_E_OBJECT_NOT_FOUND">
-          Extra data @a key not found.
-        </result>
-
-      </desc>
-      <param name="key" type="wstring" dir="in">
-        <desc>Name of the data key to follow.</desc>
-      </param>
-      <param name="nextKey" type="wstring" dir="out">
-        <desc>Name of the next data key.</desc>
-      </param>
-      <param name="nextValue" type="wstring" dir="out">
-        <desc>Value of the next data key.</desc>
+    <method name="getExtraDataKeys">
+      <desc>
+        Returns an array representing the global extra data keys which currently
+        have values defined.
+      </desc>
+      <param name="value" type="wstring" dir="return" safearray="yes">
+        <desc>Array of extra data keys.</desc>
       </param>
     </method>
@@ -2750 +2723 @@
       <param name="values" type="wstring" dir="out">
         <desc>Reserved, not currently used.</desc>
-      </param>
-    </method>
-
-    <method name="saveSettings">
-      <desc>
-        Saves the global settings to the global settings file
-        (<link to="#settingsFilePath"/>).
-
-        This method is only useful for explicitly saving the global settings
-        file after it has been auto-converted from the old format to the most
-        recent format (see <link to="#settingsFileVersion"/> for details).
-        Normally, the global settings file is implicitly saved when a global
-        setting is changed.
-
-        <result name="VBOX_E_FILE_ERROR">
-          Settings file not accessible.
-        </result>
-        <result name="VBOX_E_XML_ERROR">
-          Could not parse the settings file.
-        </result>
-
-      </desc>
-    </method>
-
-    <method name="saveSettingsWithBackup">
-      <desc>
-        Creates a backup copy of the global settings file
-        (<link to="IVirtualBox::settingsFilePath"/>) in case of auto-conversion,
-        and then calls <link to="IVirtualBox::saveSettings"/>.
-
-        Note that the backup copy is created <b>only</b> if the settings file
-        auto-conversion took place (see <link to="#settingsFileVersion"/> for
-        details). Otherwise, this call is fully equivalent to
-        <link to="IVirtualBox::saveSettings"/> and no backup copying is done.
-
-        The backup copy is created in the same directory where the original
-        settings file is located. It is given the following file name:
-        <pre>
-          original.xml.x.y-platform.bak
-        </pre>
-        where <tt>original.xml</tt> is the original settings file name
-        (excluding path), and <tt>x.y-platform</tt> is the version of the old
-        format of the settings file (before auto-conversion).
-
-        If the given backup file already exists, this method will try to add the
-        <tt>.N</tt> suffix to the backup file name (where @c N counts from
-        0 to 9) and copy it again until it succeeds. If all suffixes are
-        occupied, or if any other copy error occurs, this method will return a
-        failure.
-
-        If the copy operation succeeds, the @a bakFileName return argument will
-        receive a full path to the created backup file (for informational
-        purposes). Note that this will happen even if the subsequent
-        <link to="#saveSettings"/> call performed by this method after the
-        copy operation, fails.
-
-        <note>
-          The VirtualBox API never calls this method. It is intended purely for
-          the purposes of creating backup copies of the settings files by
-          front-ends before saving the results of the automatically performed
-          settings conversion to disk.
-        </note>
-
-        <see>settingsFileVersion</see>
-
-        <result name="VBOX_E_FILE_ERROR">
-          Settings file not accessible.
-        </result>
-        <result name="VBOX_E_XML_ERROR">
-          Could not parse the settings file.
-        </result>
-        <result name="VBOX_E_IPRT_ERROR">
-          Could not copy the settings file.
-        </result>
-
-      </desc>
-      <param name="bakFileName" type="wstring" dir="return">
-        <desc>Full path to the created backup copy.</desc>
       </param>
     </method>
@@ -4224 +4119 @@
         to OpenGL only. </desc>
     </attribute>
-    
+
     <attribute name="accelerate2DVideoEnabled" type="boolean" default="false">
       <desc>
@@ -4350 +4245 @@
       <desc>
         Full name of the file containing machine settings data.
-      </desc>
-    </attribute>
-
-    <attribute name="settingsFileVersion" type="wstring" readonly="yes">
-      <desc>
-        Current version of the format of the settings file of this machine
-        (<link to="IMachine::settingsFilePath"/>).
-
-        The version string has the following format:
-        <pre>
-          x.y-platform
-        </pre>
-        where @c x and @c y are the major and the minor format
-        versions, and @c platform is the platform identifier.
-
-        The current version usually matches the value of the
-        <link to="IVirtualBox::settingsFormatVersion"/> attribute unless the
-        settings file was created by an older version of VirtualBox and there
-        was a change of the settings file format since then.
-
-        Note that VirtualBox automatically converts settings files from older
-        versions to the most recent version when reading them (usually at
-        VirtualBox startup) but it doesn't save the changes back until
-        you call a method that implicitly saves settings (such as
-        <link to="#setExtraData"/>) or call <link to="#saveSettings"/>
-        explicitly. Therefore, if the value of this attribute differs from the
-        value of <link to="IVirtualBox::settingsFormatVersion"/>, then it
-        means that the settings file was converted but the result of the
-        conversion is not yet saved to disk.
-
-        The above feature may be used by interactive front-ends to inform users
-        about the settings file format change and offer them to explicitly save
-        all converted settings files (the global and VM-specific ones),
-        optionally create backup copies of the old settings files before saving,
-        etc.
-
-        <see>IVirtualBox::settingsFormatVersion, saveSettingsWithBackup()</see>
       </desc>
     </attribute>
@@ -4878 +4736 @@
     </method>
 
-    <method name="getNextExtraDataKey">
-      <desc>
-        Returns the machine-specific extra data key name following the
-        supplied key.
-
-        An error is returned if the supplied @a key does not exist. An empty
-        string is returned in @a nextKey if the supplied key is the last key.
-        When supplying @c null or an empty string for the @a key, the first key
-        item is returned in @a nextKey (if there is any). @a nextValue is an
-        optional parameter and if supplied, the next key's value is returned in
-        it.
-
-        <result name="VBOX_E_OBJECT_NOT_FOUND">
-          Extra data @a key not found.
-        </result>
-
-      </desc>
-      <param name="key" type="wstring" dir="in">
-        <desc>Name of the data key to follow.</desc>
-      </param>
-      <param name="nextKey" type="wstring" dir="out">
-        <desc>Name of the next data key.</desc>
-      </param>
-      <param name="nextValue" type="wstring" dir="out">
-        <desc>Value of the next data key.</desc>
-      </param>
+    <method name="getExtraDataKeys">
+        <desc>
+            Returns an array representing the machine-specific extra data keys
+            which currently have values defined.
+        </desc>
+        <param name="value" type="wstring" dir="return" safearray="yes">
+            <desc>Array of extra data keys.</desc>
+        </param>
     </method>
 
@@ -5003 +4843 @@
 
       </desc>
-    </method>
-
-    <method name="saveSettingsWithBackup">
-      <desc>
-        Creates a backup copy of the machine settings file (<link
-        to="IMachine::settingsFilePath"/>) in case of auto-conversion, and then calls
-        <link to="IMachine::saveSettings"/>.
-
-        Note that the backup copy is created <b>only</b> if the settings file
-        auto-conversion took place (see <link to="#settingsFileVersion"/> for
-        details). Otherwise, this call is fully equivalent to
-        <link to="IMachine::saveSettings"/> and no backup copying is done.
-
-        The backup copy is created in the same directory where the original
-        settings file is located. It is given the following file name:
-        <pre>
-          original.xml.x.y-platform.bak
-        </pre>
-        where <tt>original.xml</tt> is the original settings file name
-        (excluding path), and <tt>x.y-platform</tt> is the version of the old
-        format of the settings file (before auto-conversion).
-
-        If the given backup file already exists, this method will try to add the
-        <tt>.N</tt> suffix to the backup file name (where @c N counts from
-        0 to 9) and copy it again until it succeeds. If all suffixes are
-        occupied, or if any other copy error occurs, this method will return a
-        failure.
-
-        If the copy operation succeeds, the @a bakFileName return argument will
-        receive a full path to the created backup file (for informational
-        purposes). Note that this will happen even if the subsequent
-        <link to="#saveSettings"/> call performed by this method after the
-        copy operation, fails.
-
-        <note>
-          The VirtualBox API never calls this method. It is intended purely for
-          the purposes of creating backup copies of the settings files by
-          front-ends before saving the results of the automatically performed
-          settings conversion to disk.
-        </note>
-
-        <see>settingsFileVersion</see>
-
-        <result name="VBOX_E_FILE_ERROR">
-          Settings file not accessible.
-        </result>
-        <result name="VBOX_E_XML_ERROR">
-          Could not parse the settings file.
-        </result>
-        <result name="VBOX_E_INVALID_VM_STATE">
-          Virtual machine is not mutable.
-        </result>
-        <result name="E_ACCESSDENIED">
-          Modification request refused.
-        </result>
-
-      </desc>
-      <param name="bakFileName" type="wstring" dir="return">
-        <desc>Full path to the created backup copy.</desc>
-      </param>
     </method>
 
@@ -11895 +11675 @@
       <desc>Null value, also means "dummy audio driver".</desc>
     </const>
-    <const name="WinMM"         value="1"/>
-    <const name="OSS"           value="2"/>
-    <const name="ALSA"          value="3"/>
-    <const name="DirectSound"   value="4"/>
-    <const name="CoreAudio"     value="5"/>
-    <const name="MMPM"          value="6"/>
-    <const name="Pulse"         value="7"/>
-    <const name="SolAudio"      value="8"/>
+    <const name="WinMM"         value="1">
+        <desc>Windows multimedia (Windows hosts only).</desc>
+    </const>
+    <const name="OSS"           value="2">
+        <desc>Open Sound System (Linux hosts only).</desc>
+    </const>
+    <const name="ALSA"          value="3">
+        <desc>Advanced Linux Sound Architecture (Linux hosts only).</desc>
+    </const>
+    <const name="DirectSound"   value="4">
+        <desc>DirectSound (Windows hosts only).</desc>
+    </const>
+    <const name="CoreAudio"     value="5">
+        <desc>CoreAudio (Mac hosts only).</desc>
+    </const>
+    <const name="MMPM"          value="6">
+        <desc>Reserved for historical reasons.</desc>
+    </const>
+    <const name="Pulse"         value="7">
+        <desc>PulseAudio (Linux hosts only).</desc>
+    </const>
+    <const name="SolAudio"      value="8">
+        <desc>Solaris audio (Solaris hosts only).</desc>
+    </const>
   </enum>
 

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

@@ -28 +28 @@
 
 class Machine;
+
+namespace settings
+{
+    class AudioAdapter;
+}
 
 class ATL_NO_VTABLE AudioAdapter :
@@ -88 +93 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aMachineNode);
-    HRESULT saveSettings (settings::Key &aMachineNode);
+    HRESULT loadSettings(const settings::AudioAdapter &data);
+    HRESULT saveSettings(settings::AudioAdapter &data);
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }

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

@@ -29 +29 @@
 class Machine;
 class GuestOSType;
+
+namespace settings
+{
+    class BIOSSettings;
+}
 
 class ATL_NO_VTABLE BIOSSettings :
@@ -119 +124 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aMachineNode);
-    HRESULT saveSettings (settings::Key &aMachineNode);
+    HRESULT loadSettings(const settings::BIOSSettings &data);
+    HRESULT saveSettings(settings::BIOSSettings &data);
 
     const Backupable <Data> &data() const { return mData; }

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

@@ -29 +29 @@
 
 #ifdef VBOX_WITH_HOSTNETIF_API
-/* class DHCPServer; */
-/* #include "netif.h" */
 struct NETIFINFO;
 #endif
+
+namespace settings
+{
+    class DHCPServer;
+}
 
 class ATL_NO_VTABLE DHCPServer :
@@ -61 +64 @@
     void FinalRelease();
 
-    HRESULT init(VirtualBox *aVirtualBox, IN_BSTR aName);
-    HRESULT init(VirtualBox *aVirtualBox, const settings::Key &aNode);
-    HRESULT saveSettings (settings::Key &aParentNode);
+    HRESULT init(VirtualBox *aVirtualBox,
+                 IN_BSTR aName);
+    HRESULT init(VirtualBox *aVirtualBox,
+                 const settings::DHCPServer &data);
+    HRESULT saveSettings(settings::DHCPServer &data);
 
     void uninit();
 
     // IDHCPServer properties
-    STDMETHOD(COMGETTER(NetworkName)) (BSTR *aName);
-    STDMETHOD(COMGETTER(Enabled)) (BOOL *aEnabled);
-    STDMETHOD(COMSETTER(Enabled)) (BOOL aEnabled);
-    STDMETHOD(COMGETTER(IPAddress)) (BSTR *aIPAddress);
-    STDMETHOD(COMGETTER(NetworkMask)) (BSTR *aNetworkMask);
-    STDMETHOD(COMGETTER(LowerIP)) (BSTR *aIPAddress);
-    STDMETHOD(COMGETTER(UpperIP)) (BSTR *aIPAddress);
+    STDMETHOD(COMGETTER(NetworkName))(BSTR *aName);
+    STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled);
+    STDMETHOD(COMSETTER(Enabled))(BOOL aEnabled);
+    STDMETHOD(COMGETTER(IPAddress))(BSTR *aIPAddress);
+    STDMETHOD(COMGETTER(NetworkMask))(BSTR *aNetworkMask);
+    STDMETHOD(COMGETTER(LowerIP))(BSTR *aIPAddress);
+    STDMETHOD(COMGETTER(UpperIP))(BSTR *aIPAddress);
 
-    STDMETHOD(SetConfiguration) (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress);
+    STDMETHOD(SetConfiguration)(IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress);
 
-    STDMETHOD(Start) (IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType);
-    STDMETHOD(Stop) ();
+    STDMETHOD(Start)(IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType);
+    STDMETHOD(Stop)();
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -106 +111 @@
 
 #endif // ____H_H_DHCPSERVERIMPL
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -53 +53 @@
 {
 public:
-    DHCPServerRunner(); 
+    DHCPServerRunner();
     ~DHCPServerRunner() { stop(); /* don't leave abandoned servers */}
 
@@ -79 +79 @@
     }
 
+    int setOption(DHCPCFG opt, const com::Utf8Str &val, bool enabled)
+    {
+        return setOption(opt, val.c_str(), enabled);
+    }
+
     int start();
     int stop();

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

@@ -30 +30 @@
 
 class Machine;
+
+namespace settings
+{
+    class DVDDrive;
+}
 
 class ATL_NO_VTABLE DVDDrive :
@@ -100 +105 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aMachineNode);
-    HRESULT saveSettings (settings::Key &aMachineNode);
+    HRESULT loadSettings(const settings::DVDDrive &data);
+    HRESULT saveSettings(settings::DVDDrive &data);
 
     bool isModified() { AutoWriteLock alock (this); return m.isBackedUp(); }

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

@@ -30 +30 @@
 
 class Machine;
+
+namespace settings
+{
+    class FloppyDrive;
+}
 
 class ATL_NO_VTABLE FloppyDrive :
@@ -100 +105 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aMachineNode);
-    HRESULT saveSettings (settings::Key &aMachineNode);
+    HRESULT loadSettings(const settings::FloppyDrive &data);
+    HRESULT saveSettings(settings::FloppyDrive &data);
 
     bool isModified() { AutoWriteLock alock (this); return m.isBackedUp(); }

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

@@ -38 +38 @@
 
 class Progress;
+namespace settings
+{
+    class Medium;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -96 +100 @@
     HRESULT init(VirtualBox *aVirtualBox,
                  HardDisk *aParent,
-                 const settings::Key &aNode);
+                 const settings::Medium &data);
     void uninit();
 
@@ -148 +152 @@
     bool isReadOnly();
 
-    HRESULT saveSettings (settings::Key &aParentNode);
-
-    HRESULT compareLocationTo (const char *aLocation, int &aResult);
+    HRESULT saveSettings(settings::Medium &data);
+
+    HRESULT compareLocationTo(const Utf8Str &strLocation, int &aResult);
 
     /**
@@ -256 +260 @@
 private:
 
-    HRESULT setLocation (CBSTR aLocation);
+    virtual HRESULT setLocation(const Utf8Str &aLocation);
     HRESULT setFormat (CBSTR aFormat);
 

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

@@ -48 +48 @@
 class Progress;
 
+namespace settings
+{
+    class Host;
+}
+
 #include <list>
 
@@ -74 +79 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (VirtualBox *aParent);
+    HRESULT init(VirtualBox *aParent);
     void uninit();
 
@@ -114 +119 @@
 
     // public methods only for internal purposes
-
-    HRESULT loadSettings (const settings::Key &aGlobal);
-    HRESULT saveSettings (settings::Key &aGlobal);
+    HRESULT loadSettings(const settings::Host &data);
+    HRESULT saveSettings(settings::Host &data);
 
 #ifdef VBOX_WITH_USB

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

@@ -37 +37 @@
 #include "ParallelPortImpl.h"
 #include "BIOSSettingsImpl.h"
-#include "StorageControllerImpl.h"
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
 #include "PerformanceImpl.h"
@@ -70 +69 @@
 class SharedFolder;
 class HostUSBDevice;
+class StorageController;
 
 class SessionMachine;
+
+namespace settings
+{
+    class MachineConfigFile;
+    class Snapshot;
+    class Hardware;
+    class Storage;
+    class StorageController;
+    class MachineRegistryEntry;
+}
 
 // Machine class
@@ -87 +97 @@
 
     enum InstanceType { IsMachine, IsSessionMachine, IsSnapshotMachine };
+
+    enum InitMode { Init_New, Init_Import, Init_Registered };
 
     /**
@@ -151 +163 @@
         const Guid mUuid;
         BOOL mRegistered;
+        InitMode mInitMode;
 
         /** Flag indicating that the config file is read-only. */
         BOOL mConfigFileReadonly;
-        Bstr mConfigFile;
-        Bstr mConfigFileFull;
-
-        Utf8Str mSettingsFileVersion;
+        Utf8Str m_strConfigFile;
+        Utf8Str m_strConfigFileFull;
+
+        // machine settings XML file
+        settings::MachineConfigFile *m_pMachineConfigFile;
 
         BOOL mAccessible;
@@ -247 +261 @@
         struct GuestProperty {
             /** Property name */
-            Bstr mName;
+            Utf8Str strName;
             /** Property value */
-            Bstr mValue;
+            Utf8Str strValue;
             /** Property timestamp */
             ULONG64 mTimestamp;
@@ -270 +284 @@
         BOOL           mHWVirtExNestedPagingEnabled;
         BOOL           mHWVirtExVPIDEnabled;
-        BOOL           mAccelerate3DEnabled;
         BOOL           mAccelerate2DVideoEnabled;
         BOOL           mPAEEnabled;
         ULONG          mCPUCount;
-
-        DeviceType_T   mBootOrder [SchemaDefs::MaxBootPosition];
-
-        typedef std::list <ComObjPtr<SharedFolder> > SharedFolderList;
+        BOOL           mAccelerate3DEnabled;
+
+        DeviceType_T   mBootOrder[SchemaDefs::MaxBootPosition];
+
+        typedef std::list< ComObjPtr<SharedFolder> > SharedFolderList;
         SharedFolderList mSharedFolders;
+
         ClipboardMode_T mClipboardMode;
-        typedef std::list <GuestProperty> GuestPropertyList;
+
+        typedef std::list<GuestProperty> GuestPropertyList;
         GuestPropertyList mGuestProperties;
         BOOL           mPropertyServiceActive;
@@ -464 +480 @@
     NS_DECL_ISUPPORTS
 
-    DECLARE_EMPTY_CTOR_DTOR (Machine)
+    DECLARE_EMPTY_CTOR_DTOR(Machine)
 
     HRESULT FinalConstruct();
     void FinalRelease();
 
-    enum InitMode { Init_New, Init_Existing, Init_Registered };
-
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (VirtualBox *aParent, CBSTR aConfigFile,
-                  InitMode aMode, CBSTR aName = NULL,
-                  GuestOSType *aOsType = NULL,
-                  BOOL aNameSync = TRUE, const Guid *aId = NULL);
+    HRESULT init(VirtualBox *aParent,
+                 const Utf8Str &strConfigFile,
+                 InitMode aMode,
+                 CBSTR aName = NULL,
+                 GuestOSType *aOsType = NULL,
+                 BOOL aNameSync = TRUE,
+                 const Guid *aId = NULL);
     void uninit();
 
+protected:
+    HRESULT initDataAndChildObjects();
+    void uninitDataAndChildObjects();
+
+public:
     // IMachine properties
     STDMETHOD(COMGETTER(Parent))(IVirtualBox **aParent);
@@ -525 +547 @@
     STDMETHOD(COMGETTER(USBController)) (IUSBController * *aUSBController);
     STDMETHOD(COMGETTER(SettingsFilePath)) (BSTR *aFilePath);
-    STDMETHOD(COMGETTER(SettingsFileVersion)) (BSTR *aSettingsFileVersion);
     STDMETHOD(COMGETTER(SettingsModified)) (BOOL *aModified);
     STDMETHOD(COMGETTER(SessionState)) (SessionState_T *aSessionState);
@@ -555 +576 @@
     STDMETHOD(GetParallelPort) (ULONG slot, IParallelPort **port);
     STDMETHOD(GetNetworkAdapter) (ULONG slot, INetworkAdapter **adapter);
-    STDMETHOD(GetNextExtraDataKey)(IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
+    STDMETHOD(GetExtraDataKeys) (ComSafeArrayOut(BSTR, aKeys));
     STDMETHOD(GetExtraData)(IN_BSTR aKey, BSTR *aValue);
     STDMETHOD(SetExtraData)(IN_BSTR aKey, IN_BSTR aValue);
     STDMETHOD(SaveSettings)();
-    STDMETHOD(SaveSettingsWithBackup) (BSTR *aBakFileName);
     STDMETHOD(DiscardSettings)();
     STDMETHOD(DeleteSettings)();
@@ -628 +648 @@
      * for reading.
      */
-    const Bstr &settingsFileFull() const { return mData->mConfigFileFull; }
+    const Utf8Str &settingsFileFull() const { return mData->m_strConfigFileFull; }
 
     /**
@@ -650 +670 @@
     virtual HRESULT onSharedFolderChange() { return S_OK; }
 
-    HRESULT saveRegistryEntry (settings::Key &aEntryNode);
-
-    int calculateFullPath (const char *aPath, Utf8Str &aResult);
-    void calculateRelativePath (const char *aPath, Utf8Str &aResult);
+    HRESULT saveRegistryEntry(settings::MachineRegistryEntry &data);
+
+    int calculateFullPath(const Utf8Str &strPath, Utf8Str &aResult);
+    void calculateRelativePath(const Utf8Str &strPath, Utf8Str &aResult);
 
     void getLogFolder (Utf8Str &aLogFolder);
@@ -748 +768 @@
     inline Machine *machine();
 
-    HRESULT initDataAndChildObjects();
-    void uninitDataAndChildObjects();
-
     void ensureNoStateDependencies();
 
@@ -759 +776 @@
                               bool aSetError = false);
 
-    HRESULT loadSettings (bool aRegistered);
-    HRESULT loadSnapshot (const settings::Key &aNode, const Guid &aCurSnapshotId,
-                          Snapshot *aParentSnapshot);
-    HRESULT loadHardware (const settings::Key &aNode);
-    HRESULT loadStorageControllers (const settings::Key &aNode, bool aRegistered,
-                           const Guid *aSnapshotId = NULL);
-    HRESULT loadStorageDevices (ComObjPtr<StorageController> aStorageController,
-                                const settings::Key &aNode, bool aRegistered,
-                                const Guid *aSnapshotId = NULL);
-
-    HRESULT findSnapshotNode (Snapshot *aSnapshot, settings::Key &aMachineNode,
-                              settings::Key *aSnapshotsNode,
-                              settings::Key *aSnapshotNode);
-
-    HRESULT findSnapshot (const Guid &aId, ComObjPtr<Snapshot> &aSnapshot,
-                          bool aSetError = false);
-    HRESULT findSnapshot (IN_BSTR aName, ComObjPtr<Snapshot> &aSnapshot,
-                          bool aSetError = false);
-
-    HRESULT getStorageControllerByName(CBSTR aName,
+    HRESULT loadSettings(bool aRegistered);
+    HRESULT loadSnapshot(const settings::Snapshot &data,
+                         const Guid &aCurSnapshotId,
+                         Snapshot *aParentSnapshot);
+    HRESULT loadHardware(const settings::Hardware &data);
+    HRESULT loadStorageControllers(const settings::Storage &data,
+                                   bool aRegistered,
+                                   const Guid *aSnapshotId = NULL);
+    HRESULT loadStorageDevices(StorageController *aStorageController,
+                               const settings::StorageController &data,
+                               bool aRegistered,
+                               const Guid *aSnapshotId = NULL);
+
+    HRESULT findSnapshot(const Guid &aId, ComObjPtr<Snapshot> &aSnapshot,
+                         bool aSetError = false);
+    HRESULT findSnapshot(IN_BSTR aName, ComObjPtr<Snapshot> &aSnapshot,
+                         bool aSetError = false);
+
+    HRESULT getStorageControllerByName(const Utf8Str &aName,
                                        ComObjPtr<StorageController> &aStorageController,
                                        bool aSetError = false);
@@ -790 +806 @@
         SaveS_ResetCurStateModified = 0x01,
         SaveS_InformCallbacksAnyway = 0x02,
-        /* ops for #saveSnapshotSettings() */
-        SaveSS_NoOp = 0x00, SaveSS_AddOp = 0x01,
-        SaveSS_UpdateAttrsOp = 0x02, SaveSS_UpdateAllOp = 0x03,
-        SaveSS_OpMask = 0xF,
         /* flags for #saveSnapshotSettings() */
         SaveSS_CurStateModified = 0x40,
@@ -803 +815 @@
     };
 
-    HRESULT prepareSaveSettings (bool &aRenamed, bool &aNew);
-    HRESULT saveSettings (int aFlags = 0);
-
-    HRESULT saveSnapshotSettings (Snapshot *aSnapshot, int aOpFlags);
-    HRESULT saveSnapshotSettingsWorker (settings::Key &aMachineNode,
-                                        Snapshot *aSnapshot, int aOpFlags);
-
-    HRESULT saveHardware (settings::Key &aNode);
-    HRESULT saveStorageControllers (settings::Key &aNode);
-    HRESULT saveStorageDevices (ComObjPtr<StorageController> aStorageController,
-                                settings::Key &aNode);
-
-    HRESULT saveStateSettings (int aFlags);
-
-    HRESULT getExtraData(const Utf8Str &aKey, Utf8Str &aValue);
+    HRESULT prepareSaveSettings(bool &aRenamed, bool &aNew);
+    HRESULT saveSettings(int aFlags = 0);
+
+    HRESULT saveAllSnapshots();
+
+    HRESULT saveHardware(settings::Hardware &data);
+    HRESULT saveStorageControllers(settings::Storage &data);
+    HRESULT saveStorageDevices(ComObjPtr<StorageController> aStorageController,
+                               settings::StorageController &data);
+
+    HRESULT saveStateSettings(int aFlags);
 
     HRESULT createImplicitDiffs (const Bstr &aFolder,
@@ -825 +833 @@
 
     void fixupHardDisks(bool aCommit, bool aOnline = false);
-
-    HRESULT lockConfig();
-    HRESULT unlockConfig();
-
-    /** @note This method is not thread safe */
-    BOOL isConfigLocked()
-    {
-        return !!mData && mData->mHandleCfgFile != NIL_RTFILE;
-    }
 
     bool isInOwnDir (Utf8Str *aSettingsDir = NULL);
@@ -1097 +1096 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (SessionMachine *aSessionMachine,
-                  IN_GUID aSnapshotId, IN_BSTR aStateFilePath);
-    HRESULT init (Machine *aMachine,
-                  const settings::Key &aHWNode, const settings::Key &aHDAsNode,
-                  IN_GUID aSnapshotId, IN_BSTR aStateFilePath);
+    HRESULT init(SessionMachine *aSessionMachine,
+                 IN_GUID aSnapshotId,
+                 const Utf8Str &aStateFilePath);
+    HRESULT init(Machine *aMachine,
+                 const settings::Hardware &hardware,
+                 const settings::Storage &storage,
+                 IN_GUID aSnapshotId,
+                 const Utf8Str &aStateFilePath);
     void uninit();
 

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

@@ -32 +32 @@
 
 class VirtualBox;
+namespace settings
+{
+    class Medium;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -142 +146 @@
     virtual Utf8Str name();
 
-    virtual HRESULT setLocation (CBSTR aLocation);
+    virtual HRESULT setLocation(const Utf8Str &aLocation);
     virtual HRESULT queryInfo();
 
@@ -222 +226 @@
 
     // protected initializer/uninitializer for internal purposes only
-    HRESULT protectedInit (VirtualBox *aVirtualBox, CBSTR aLocation,
-                           const Guid &aId);
-    HRESULT protectedInit (VirtualBox *aVirtualBox, const settings::Key &aImageNode);
+    HRESULT protectedInit(VirtualBox *aVirtualBox,
+                          CBSTR aLocation,
+                          const Guid &aId);
+    HRESULT protectedInit(VirtualBox *aVirtualBox,
+                          const settings::Medium &data);
     void protectedUninit();
 
@@ -230 +236 @@
 
     // public methods for internal purposes only
-    HRESULT saveSettings (settings::Key &aImagesNode);
+    HRESULT saveSettings(settings::Medium &data);
 };
 
@@ -266 +272 @@
     // public initializer/uninitializer for internal purposes only
 
-    HRESULT init (VirtualBox *aParent, CBSTR aFilePath,
-                  const Guid &aId)
-    {
-        return protectedInit (aParent, aFilePath, aId);
-    }
-
-    HRESULT init (VirtualBox *aParent, const settings::Key &aImageNode)
-    {
-        return protectedInit (aParent, aImageNode);
+    HRESULT init(VirtualBox *aParent,
+                 CBSTR aFilePath,
+                 const Guid &aId)
+    {
+        return protectedInit(aParent, aFilePath, aId);
+    }
+
+    HRESULT init(VirtualBox *aParent,
+                 const settings::Medium &data)
+    {
+        return protectedInit(aParent, data);
     }
 
@@ -320 +328 @@
     // public initializer/uninitializer for internal purposes only
 
-    HRESULT init (VirtualBox *aParent, CBSTR aFilePath,
-                  const Guid &aId)
-    {
-        return protectedInit (aParent, aFilePath, aId);
-    }
-
-    HRESULT init (VirtualBox *aParent, const settings::Key &aImageNode)
-    {
-        return protectedInit (aParent, aImageNode);
+    HRESULT init(VirtualBox *aParent,
+                 CBSTR aFilePath,
+                 const Guid &aId)
+    {
+        return protectedInit(aParent, aFilePath, aId);
+    }
+
+    HRESULT init(VirtualBox *aParent,
+                 const settings::Medium &data)
+    {
+        return protectedInit(aParent, data);
     }
 

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

@@ -29 +29 @@
 class Machine;
 class GuestOSType;
+
+namespace settings
+{
+    class NetworkAdapter;
+}
 
 class ATL_NO_VTABLE NetworkAdapter :
@@ -134 +139 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aAdapterNode);
-    HRESULT saveSettings (settings::Key &aAdapterNode);
+    HRESULT loadSettings(const settings::NetworkAdapter &data);
+    HRESULT saveSettings(settings::NetworkAdapter &data);
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }

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

@@ -27 +27 @@
 
 class Machine;
+
+namespace settings
+{
+    class ParallelPort;
+}
 
 class ATL_NO_VTABLE ParallelPort :
@@ -100 +105 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aPortNode);
-    HRESULT saveSettings (settings::Key &aPortNode);
+    HRESULT loadSettings(const settings::ParallelPort &data);
+    HRESULT saveSettings(settings::ParallelPort &data);
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }

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

@@ -33 +33 @@
 #include <string>
 #include <vector>
+
+namespace com
+{
+    class Utf8Str;
+}
 
 namespace pm
@@ -414 +419 @@
         ElementList mElements;
 
-        void processMetricList(const std::string &name, const ComPtr<IUnknown> object);
+        void processMetricList(const com::Utf8Str &name, const ComPtr<IUnknown> object);
     };
 }

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

@@ -29 +29 @@
 class Machine;
 class GuestOSType;
+
+namespace settings
+{
+    class SerialPort;
+}
 
 class ATL_NO_VTABLE SerialPort :
@@ -112 +117 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aPortNode);
-    HRESULT saveSettings (settings::Key &aPortNode);
+    HRESULT loadSettings(const settings::SerialPort &data);
+    HRESULT saveSettings(settings::SerialPort &data);
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }

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

@@ -29 +29 @@
 class SnapshotMachine;
 class VirtualBox;
+
 namespace settings
 {
-    class Key;
+    class Snapshot;
 }
 
@@ -65 +66 @@
     HRESULT init(VirtualBox *aVirtualBox,
                  const Guid &aId,
-                 IN_BSTR aName,
-                 IN_BSTR aDescription,
-                 RTTIMESPEC aTimeStamp,
+                 const Utf8Str &aName,
+                 const Utf8Str &aDescription,
+                 const RTTIMESPEC &aTimeStamp,
                  SnapshotMachine *aMachine,
                  Snapshot *aParent);
@@ -104 +105 @@
 
     Guid getId() const;
-    Bstr getName() const;
+    const Utf8Str& getName() const;
     RTTIMESPEC getTimeStamp() const;
 
     ComObjPtr<Snapshot> findChildOrSelf(IN_GUID aId);
-    ComObjPtr<Snapshot> findChildOrSelf(IN_BSTR aName);
+    ComObjPtr<Snapshot> findChildOrSelf(const Utf8Str &aName);
 
     void updateSavedStatePaths(const char *aOldPath,
@@ -115 +116 @@
                                    const char *aNewPath);
 
-    HRESULT saveSnapshot(settings::Key &aNode, bool aAttrsOnly);
-    HRESULT saveSnapshotImpl(settings::Key &aNode, bool aAttrsOnly);
+    HRESULT saveSnapshot(settings::Snapshot &data, bool aAttrsOnly);
+    HRESULT saveSnapshotImpl(settings::Snapshot &data, bool aAttrsOnly);
 
     // for VirtualBoxSupportErrorInfoImpl

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

@@ -52 +52 @@
         bool operator== (const Data &that) const
         {
-            return this == &that || ((mStorageControllerType == that.mStorageControllerType) &&
-                    (mName           == that.mName) &&
-                    (mPortCount   == that.mPortCount) &&
-                    (mPortIde0Master == that.mPortIde0Master) &&
-                    (mPortIde0Slave  == that.mPortIde0Slave)  &&
-                    (mPortIde1Master == that.mPortIde1Master) &&
-                    (mPortIde1Slave  == that.mPortIde1Slave));
+            return    this == &that
+                   || (    (mStorageControllerType == that.mStorageControllerType)
+                        && (strName           == that.strName)
+                        && (mPortCount   == that.mPortCount)
+                        && (mPortIde0Master == that.mPortIde0Master)
+                        && (mPortIde0Slave  == that.mPortIde0Slave)
+                        && (mPortIde1Master == that.mPortIde1Master)
+                        && (mPortIde1Slave  == that.mPortIde1Slave));
         }
 
-        /** Uniuqe name of the storage controller. */
-        Bstr mName;
+        /** Unique name of the storage controller. */
+        Utf8Str strName;
         /** The connection type of thestorage controller. */
         StorageBus_T mStorageBus;
@@ -103 +104 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Machine *aParent, IN_BSTR aName,
-                  StorageBus_T aBus);
-    HRESULT init (Machine *aParent, StorageController *aThat, bool aReshare = false);
-    HRESULT initCopy (Machine *aParent, StorageController *aThat);
+    HRESULT init(Machine *aParent,
+                 const Utf8Str &aName,
+                 StorageBus_T aBus);
+    HRESULT init(Machine *aParent,
+                 StorageController *aThat,
+                 bool aReshare = false);
+    HRESULT initCopy(Machine *aParent,
+                     StorageController *aThat);
     void uninit();
 
@@ -128 +133 @@
     // public methods only for internal purposes
 
-    const Bstr &name() const { return mData->mName; }
+    const Utf8Str &name() const { return mData->strName; }
     StorageControllerType_T controllerType() const { return mData->mStorageControllerType; }
+    StorageBus_T storageBus() const { return mData->mStorageBus; }
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }
@@ -159 +165 @@
     const ComObjPtr<StorageController> mPeer;
     /** Data. */
-    Backupable <Data> mData;
+    Backupable<Data> mData;
 
     /* Instance number of the device in the running VM. */

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

@@ -33 +33 @@
 
 class VirtualBox;
+namespace settings
+{
+    class SystemProperties;
+}
 
 class ATL_NO_VTABLE SystemProperties :
@@ -95 +99 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aGlobal);
-    HRESULT saveSettings (settings::Key &aGlobal);
+    HRESULT loadSettings(const settings::SystemProperties &data);
+    HRESULT saveSettings(settings::SystemProperties &data);
 
-    ComObjPtr<HardDiskFormat> hardDiskFormat (CBSTR aFormat);
+    ComObjPtr<HardDiskFormat> hardDiskFormat(CBSTR aFormat);
 
     // public methods for internal purposes only
     // (ensure there is a caller and a read lock before calling them!)
-
-    /** Default Machine path (as is, not full). Not thread safe (use object lock). */
-    const Bstr &defaultMachineFolder() const { return mDefaultMachineFolder; }
-    /** Default Machine path (full). Not thread safe (use object lock). */
-    const Bstr &defaultMachineFolderFull() const { return mDefaultMachineFolderFull; }
-    /** Default hard disk path (as is, not full). Not thread safe (use object lock). */
-    const Bstr &defaultHardDiskFolder() const { return mDefaultHardDiskFolder; }
-    /** Default hard disk path (full). Not thread safe (use object lock). */
-    const Bstr &defaultHardDiskFolderFull() const { return mDefaultHardDiskFolderFull; }
-
-    /** Default hard disk format. Not thread safe (use object lock). */
-    const Bstr &defaultHardDiskFormat() const { return mDefaultHardDiskFormat; }
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -120 +112 @@
 private:
 
-    typedef std::list <ComObjPtr<HardDiskFormat> > HardDiskFormatList;
+    typedef std::list< ComObjPtr<HardDiskFormat> > HardDiskFormatList;
 
-    HRESULT setDefaultMachineFolder (CBSTR aPath);
-    HRESULT setDefaultHardDiskFolder (CBSTR aPath);
-    HRESULT setDefaultHardDiskFormat (CBSTR aFormat);
+    HRESULT setDefaultMachineFolder(const Utf8Str &aPath);
+    HRESULT setDefaultHardDiskFolder(const Utf8Str &aPath);
+    HRESULT setDefaultHardDiskFormat(const Utf8Str &aFormat);
 
-    HRESULT setRemoteDisplayAuthLibrary (CBSTR aPath);
-    HRESULT setWebServiceAuthLibrary (CBSTR aPath);
+    HRESULT setRemoteDisplayAuthLibrary(const Utf8Str &aPath);
+    HRESULT setWebServiceAuthLibrary(const Utf8Str &aPath);
 
     const ComObjPtr<VirtualBox, ComWeakRef> mParent;
 
-    Bstr mDefaultMachineFolder;
-    Bstr mDefaultMachineFolderFull;
-    Bstr mDefaultHardDiskFolder;
-    Bstr mDefaultHardDiskFolderFull;
-    Bstr mDefaultHardDiskFormat;
+    Utf8Str m_strDefaultMachineFolder;
+    Utf8Str m_strDefaultMachineFolderFull;
+    Utf8Str m_strDefaultHardDiskFolder;
+    Utf8Str m_strDefaultHardDiskFolderFull;
+    Utf8Str m_strDefaultHardDiskFormat;
 
     HardDiskFormatList mHardDiskFormats;
 
-    Bstr mRemoteDisplayAuthLibrary;
-    Bstr mWebServiceAuthLibrary;
+    Utf8Str m_strRemoteDisplayAuthLibrary;
+    Utf8Str m_strWebServiceAuthLibrary;
     ULONG mLogHistoryCount;
     AudioDriverType_T mDefaultAudioDriver;
+
+    friend class VirtualBox;
 };
 

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

@@ -34 +34 @@
 class Machine;
 class HostUSBDevice;
+
+namespace settings
+{
+    class USBController;
+}
 
 /**
@@ -109 +114 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aMachineNode);
-    HRESULT saveSettings (settings::Key &aMachineNode);
+    HRESULT loadSettings(const settings::USBController &data);
+    HRESULT saveSettings(settings::USBController &data);
 
     bool isModified();

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

@@ -30 +30 @@
 
 class Machine;
+
+namespace settings
+{
+    class VRDPSettings;
+}
 
 class ATL_NO_VTABLE VRDPServer :
@@ -107 +112 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings (const settings::Key &aMachineNode);
-    HRESULT saveSettings (settings::Key &aMachineNode);
+    HRESULT loadSettings(const settings::VRDPSettings &data);
+    HRESULT saveSettings(settings::VRDPSettings &data);
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }

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

@@ -36 +36 @@
 // avoid including VBox/settings.h and VBox/xml.h;
 // only declare the classes
-namespace settings
-{
-class XmlTreeBackend;
-class TreeBackend;
-class Key;
-}
-
 namespace xml
 {

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

@@ -62 +62 @@
 struct VMClientWatcherData;
 
+namespace settings
+{
+    class MainConfigFile;
+}
+
 class ATL_NO_VTABLE VirtualBox :
     public VirtualBoxBaseWithChildrenNEXT,
@@ -111 +116 @@
     /* public initializer/uninitializer for internal purposes only */
     HRESULT init();
+    HRESULT initMachines();
+    HRESULT initMedia();
     void uninit();
 
@@ -119 +126 @@
     STDMETHOD(COMGETTER(HomeFolder)) (BSTR *aHomeFolder);
     STDMETHOD(COMGETTER(SettingsFilePath)) (BSTR *aSettingsFilePath);
-    STDMETHOD(COMGETTER(SettingsFileVersion)) (BSTR *aSettingsFileVersion);
-    STDMETHOD(COMGETTER(SettingsFormatVersion)) (BSTR *aSettingsFormatVersion);
     STDMETHOD(COMGETTER(Host)) (IHost **aHost);
     STDMETHOD(COMGETTER(SystemProperties)) (ISystemProperties **aSystemProperties);
@@ -168 +173 @@
     STDMETHOD(CreateSharedFolder) (IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable);
     STDMETHOD(RemoveSharedFolder) (IN_BSTR aName);
-    STDMETHOD(GetNextExtraDataKey) (IN_BSTR aKey, BSTR *aNextKey, BSTR *aNextValue);
+    STDMETHOD(GetExtraDataKeys) (ComSafeArrayOut(BSTR, aKeys));
     STDMETHOD(GetExtraData) (IN_BSTR aKey, BSTR *aValue);
     STDMETHOD(SetExtraData) (IN_BSTR aKey, IN_BSTR aValue);
@@ -183 +188 @@
                                       BSTR *aChanged, BSTR *aValues);
 
-    STDMETHOD(SaveSettings)();
-    STDMETHOD(SaveSettingsWithBackup) (BSTR *aBakFileName);
-
 //    STDMETHOD(CreateDHCPServerForInterface) (/*IHostNetworkInterface * aIinterface, */IDHCPServer ** aServer);
     STDMETHOD(CreateDHCPServer) (IN_BSTR aName, IDHCPServer ** aServer);
@@ -257 +259 @@
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
+    const Utf8Str& getDefaultMachineFolder() const;
+    const Utf8Str& getDefaultHardDiskFolder() const;
+    const Utf8Str& getDefaultHardDiskFormat() const;
 
     /** Returns the VirtualBox home directory */
     const Utf8Str &homeDir() { return mData.mHomeDir; }
 
-    int calculateFullPath (const char *aPath, Utf8Str &aResult);
-    void calculateRelativePath (const char *aPath, Utf8Str &aResult);
+    int calculateFullPath(const Utf8Str &strPath, Utf8Str &aResult);
+    void calculateRelativePath(const Utf8Str &strPath, Utf8Str &aResult);
 
     HRESULT registerHardDisk(HardDisk *aHardDisk, bool aSaveRegistry = true);
@@ -276 +281 @@
 
     HRESULT saveSettings();
-    HRESULT updateSettings (const char *aOldPath, const char *aNewPath);
-
-    const Bstr &settingsFileName() { return mData.mCfgFile.mName; }
-
-    static HRESULT ensureFilePathExists (const char *aFileName);
-
-    static HRESULT loadSettingsTree (settings::XmlTreeBackend &aTree,
-                                     xml::File &aFile,
-                                     bool aValidate,
-                                     bool aCatchLoadErrors,
-                                     bool aAddDefaults,
-                                     Utf8Str *aFormatVersion = NULL);
-
-    /**
-     * Shortcut to loadSettingsTree (aTree, aFile, true, true, true).
-     *
-     * Used when the settings file is to be loaded for the first time for the
-     * given object in order to recreate it from the stored settings.
-     *
-     * @param aFormatVersion Where to store the current format version of the
-     *                       loaded settings tree.
-     */
-    static HRESULT loadSettingsTree_FirstTime (settings::XmlTreeBackend &aTree,
-                                               xml::File &aFile,
-                                               Utf8Str &aFormatVersion)
+    HRESULT updateSettings(const char *aOldPath, const char *aNewPath);
+
+    static HRESULT ensureFilePathExists(const Utf8Str &strFileName);
+
+    static HRESULT handleUnexpectedExceptions (RT_SRC_POS_DECL);
+
+    const Utf8Str& settingsFilePath()
     {
-        return loadSettingsTree (aTree, aFile, true, true, true,
-                                 &aFormatVersion);
+        return m_strSettingsFilePath;
     }
-
-    /**
-     * Shortcut to loadSettingsTree (aTree, aFile, true, false, true).
-     *
-     * Used when the settings file is loaded again (after it has been fully
-     * checked and validated by #loadSettingsTree_FirstTime()) in order to
-     * look at settings that don't have any representation within object's
-     * data fields.
-     */
-    static HRESULT loadSettingsTree_Again (settings::XmlTreeBackend &aTree,
-                                           xml::File &aFile)
-    {
-        return loadSettingsTree (aTree, aFile, true, false, true);
-    }
-
-    /**
-     * Shortcut to loadSettingsTree (aTree, aFile, true, false, false).
-     *
-     * Used when the settings file is loaded again (after it has been fully
-     * checked and validated by #loadSettingsTree_FirstTime()) in order to
-     * update some settings and then save them back.
-     */
-    static HRESULT loadSettingsTree_ForUpdate (settings::XmlTreeBackend &aTree,
-                                               xml::File &aFile)
-    {
-        return loadSettingsTree (aTree, aFile, true, false, false);
-    }
-
-    static HRESULT saveSettingsTree (settings::TreeBackend &aTree,
-                                     xml::File &aFile,
-                                     Utf8Str &aFormatVersion);
-
-    static HRESULT backupSettingsFile (const Bstr &aFileName,
-                                       const Utf8Str &aOldFormat,
-                                       Bstr &aBakFileName);
-
-    static HRESULT handleUnexpectedExceptions (RT_SRC_POS_DECL);
 
     /**
@@ -364 +313 @@
 private:
 
-    typedef std::list <ComObjPtr<Machine> > MachineList;
-    typedef std::list <ComObjPtr<GuestOSType> > GuestOSTypeList;
-
-    typedef std::map <Guid, ComPtr<IProgress> > ProgressMap;
-
-    typedef std::list <ComObjPtr<HardDisk> > HardDiskList;
-    typedef std::list <ComObjPtr<DVDImage> > DVDImageList;
-    typedef std::list <ComObjPtr<FloppyImage> > FloppyImageList;
-    typedef std::list <ComObjPtr<SharedFolder> > SharedFolderList;
-    typedef std::list <ComObjPtr<DHCPServer> > DHCPServerList;
-
-    typedef std::map <Guid, ComObjPtr<HardDisk> > HardDiskMap;
+    typedef std::list< ComObjPtr<Machine> > MachineList;
+    typedef std::list< ComObjPtr<GuestOSType> > GuestOSTypeList;
+
+    typedef std::map<Guid, ComPtr<IProgress> > ProgressMap;
+
+    typedef std::list< ComObjPtr<HardDisk> > HardDiskList;
+    typedef std::list< ComObjPtr<DVDImage> > DVDImageList;
+    typedef std::list< ComObjPtr<FloppyImage> > FloppyImageList;
+    typedef std::list< ComObjPtr<SharedFolder> > SharedFolderList;
+    typedef std::list< ComObjPtr<DHCPServer> > DHCPServerList;
+
+    typedef std::map<Guid, ComObjPtr<HardDisk> > HardDiskMap;
 
     /**
@@ -390 +339 @@
                                      Utf8Str &aConflictType);
 
-    HRESULT loadMachines (const settings::Key &aGlobal);
-    HRESULT loadMedia (const settings::Key &aGlobal);
-    HRESULT loadNetservices (const settings::Key &aGlobal);
-
     HRESULT registerMachine (Machine *aMachine);
 
     HRESULT registerDHCPServer(DHCPServer *aDHCPServer,
-                                         bool aSaveRegistry = true);
+                               bool aSaveRegistry = true);
     HRESULT unregisterDHCPServer(DHCPServer *aDHCPServer,
-                                         bool aSaveRegistry = true);
-
-    HRESULT lockConfig();
-    HRESULT unlockConfig();
-
-    /** @note This method is not thread safe */
-    bool isConfigLocked() { return mData.mCfgFile.mHandle != NIL_RTFILE; }
+                                 bool aSaveRegistry = true);
+
+    // VirtualBox main settings file
+    const Utf8Str m_strSettingsFilePath;
+    settings::MainConfigFile *m_pMainConfigFile;
 
     /**
@@ -416 +359 @@
         Data();
 
-        struct CfgFile
-        {
-            CfgFile() : mHandle (NIL_RTFILE) {}
-
-            const Bstr mName;
-            RTFILE mHandle;
-            /** Flag indicating that the config file is read-only. */
-            BOOL mReadonly;
-        };
-
         // const data members not requiring locking
-        const Utf8Str mHomeDir;
+        const Utf8Str                       mHomeDir;
 
         // const objects not requiring locking
-        const ComObjPtr<Host> mHost;
-        const ComObjPtr<SystemProperties> mSystemProperties;
+        const ComObjPtr<Host>               mHost;
+        const ComObjPtr<SystemProperties>   mSystemProperties;
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
         const ComObjPtr<PerformanceCollector> mPerformanceCollector;
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
-        CfgFile mCfgFile;
-
-        Utf8Str mSettingsFileVersion;
-
-        MachineList mMachines;
-        GuestOSTypeList mGuestOSTypes;
-
-        ProgressMap mProgressOperations;
-
-        HardDiskList mHardDisks;
-        DVDImageList mDVDImages;
-        FloppyImageList mFloppyImages;
-        SharedFolderList mSharedFolders;
-        DHCPServerList mDHCPServers;
+        MachineList                         mMachines;
+        GuestOSTypeList                     mGuestOSTypes;
+
+        ProgressMap                         mProgressOperations;
+
+        HardDiskList                        mHardDisks;
+        DVDImageList                        mDVDImages;
+        FloppyImageList                     mFloppyImages;
+        SharedFolderList                    mSharedFolders;
+        DHCPServerList                      mDHCPServers;
 
         /// @todo NEWMEDIA do we really need this map? Used only in
         /// find() it seems
-        HardDiskMap mHardDiskMap;
-
-        CallbackList mCallbacks;
+        HardDiskMap                         mHardDiskMap;
+
+        CallbackList                        mCallbacks;
     };
 
@@ -508 +437 @@
     RWLockHandle mChildrenMapLockHandle;
 
+    /* static variables (defined in VirtualBoxImpl.cpp) */
     static Bstr sVersion;
     static ULONG sRevision;
     static Bstr sPackageType;
-    static Bstr sSettingsFormatVersion;
 
     static DECLCALLBACK(int) ClientWatcher (RTTHREAD thread, void *pvUser);

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

@@ -25 +25 @@
 #define ____H_VIRTUALBOXIMPLEXTRA
 
-class SettingsTreeHelper : public settings::XmlTreeBackend::InputResolver
-                         , public settings::XmlTreeBackend::AutoConverter
-{
-public:
-
-    // InputResolver interface
-    xml::Input *resolveEntity (const char *aURI, const char *aID);
-
-    // AutoConverter interface
-    bool needsConversion (const settings::Key &aRoot, char **aOldVersion) const;
-    const char *templateUri() const;
-};
-
 #endif // ____H_VIRTUALBOXIMPL EXTRA
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -66 +66 @@
 
 #endif /* ____H_VIRTUALBOXXMLUTIL */
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
+

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

@@ -19 +19 @@
  */
 
-#include <iprt/err.h>
-#include <iprt/file.h>
-#include <iprt/lock.h>
-
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/globals.h>
-#include <libxml/xmlIO.h>
-#include <libxml/xmlsave.h>
-#include <libxml/uri.h>
-
-#include <libxml/xmlschemas.h>
-
-#include <libxslt/xsltInternals.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
-
-#include <list>
-
-// #include <string.h>
-
+#include "VBox/com/string.h"
 #include "VBox/settings.h"
-
-#include "Logging.h"
-
-namespace settings
-{
-
-// Helpers
-////////////////////////////////////////////////////////////////////////////////
-
-inline int sFromHex (char aChar)
-{
-    if (aChar >= '0' && aChar <= '9')
-        return aChar - '0';
-    if (aChar >= 'A' && aChar <= 'F')
-        return aChar - 'A' + 0xA;
-    if (aChar >= 'a' && aChar <= 'f')
-        return aChar - 'a' + 0xA;
-
-    throw ENoConversion(com::Utf8StrFmt("'%c' (0x%02X) is not hex", aChar, aChar));
-}
-
-inline char sToHex (int aDigit)
-{
-    return (aDigit < 0xA) ? aDigit + '0' : aDigit - 0xA + 'A';
-}
-
-static char *duplicate_chars (const char *that)
-{
-    char *result = NULL;
-    if (that != NULL)
-    {
-        size_t len = strlen (that) + 1;
-        result = new char [len];
-        if (result != NULL)
-            memcpy (result, that, len);
-    }
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// string -> type conversions
-//////////////////////////////////////////////////////////////////////////////
-
-uint64_t FromStringInteger (const char *aValue, bool aSigned,
-                            int aBits, uint64_t aMin, uint64_t aMax)
-{
-    if (aValue == NULL)
-        throw ENoValue();
-
-    switch (aBits)
-    {
-        case 8:
-        case 16:
-        case 32:
-        case 64:
+#include <iprt/xml_cpp.h>
+#include <iprt/stream.h>
+#include <iprt/ctype.h>
+
+#include "VirtualBoxXMLUtil.h"
+
+using namespace com;
+using namespace settings;
+
+/**
+ * Opaque data structore for ConfigFileBase (only declared
+ * in header, defined only here).
+ */
+
+struct ConfigFileBase::Data
+{
+    Data()
+        : pParser(NULL),
+          pDoc(NULL),
+          pelmRoot(NULL)
+    {}
+
+    ~Data()
+    {
+        cleanup();
+    }
+
+    iprt::MiniString        strFilename;
+    bool                    fFileExists;
+
+    xml::XmlFileParser      *pParser;
+    xml::Document           *pDoc;
+    xml::ElementNode        *pelmRoot;
+    com::Utf8Str            strSettingsVersionFull;     // e.g. "1.7-linux"
+    SettingsVersion_T       sv;                         // e.g. SETTINGS_VERSION_1_7
+
+    void cleanup()
+    {
+        if (pDoc)
+        {
+            delete pDoc;
+            pDoc = NULL;
+            pelmRoot = NULL;
+        }
+
+        if (pParser)
+        {
+            delete pParser;
+            pParser = NULL;
+        }
+    }
+};
+
+/**
+ * Private exception class (not in the header file) that makes
+ * throwing xml::LogicError instances easier. That class is public
+ * and should be caught by client code.
+ */
+class settings::ConfigFileError : public xml::LogicError
+{
+public:
+    ConfigFileError(const ConfigFileBase *file, const char *pcszFormat, ...)
+        : xml::LogicError()
+    {
+        va_list args;
+        va_start(args, pcszFormat);
+        Utf8StrFmtVA what(pcszFormat, args);
+        va_end(args);
+
+        Utf8StrFmt str("Error reading %s. %s", file->m->strFilename.c_str(), what.c_str());
+
+        setWhat(str.c_str());
+    }
+};
+
+/**
+ * Constructor. Allocates the XML internals.
+ * @param strFilename
+ */
+ConfigFileBase::ConfigFileBase(const com::Utf8Str *pstrFilename)
+    : m(new Data)
+{
+    m->fFileExists = false;
+
+    if (pstrFilename)
+    {
+        m->strFilename = *pstrFilename;
+
+        m->pParser = new xml::XmlFileParser;
+        m->pDoc = new xml::Document;
+        m->pParser->read(*pstrFilename,
+                        *m->pDoc);
+
+        m->fFileExists = true;
+
+        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\"."));
+
+        if (!(m->pelmRoot->getAttributeValue("version", m->strSettingsVersionFull)))
+            throw ConfigFileError(this, N_("Required VirtualBox/version attribute is missing"));
+
+        m->sv = SettingsVersion_Null;
+        if (m->strSettingsVersionFull.length() > 3)
+        {
+            const char *pcsz = m->strSettingsVersionFull.c_str();
+            if (    (pcsz[0] == '1')
+                && (pcsz[1] == '.')
+                && (pcsz[3] == '-')
+            )
+            {
+                if (pcsz[2] == '7')
+                    m->sv = SettingsVersion_v1_7;
+                else if (pcsz[2] == '8')
+                    m->sv = SettingsVersion_v1_8;
+            }
+        }
+
+        if (m->sv == SettingsVersion_Null)
+            throw ConfigFileError(this, N_("Cannot handle settings version '%s'"), m->strSettingsVersionFull.c_str());
+    }
+    else
+    {
+        m->strSettingsVersionFull = VBOX_XML_VERSION_FULL;
+        m->sv = SettingsVersion_v1_8;
+    }
+}
+
+/**
+ * Clean up.
+ */
+ConfigFileBase::~ConfigFileBase()
+{
+    if (m)
+    {
+        delete m;
+        m = NULL;
+    }
+}
+
+/**
+ * Helper function that parses a UUID in string form into
+ * a com::Guid item. Since that uses an IPRT function which
+ * does not accept "{}" characters around the UUID string,
+ * we handle that here. Throws on errors.
+ * @param guid
+ * @param strUUID
+ */
+void ConfigFileBase::parseUUID(Guid &guid,
+                               const Utf8Str &strUUID) const
+{
+    // {5f102a55-a51b-48e3-b45a-b28d33469488}
+    // 01234567890123456789012345678901234567
+    //           1         2         3
+    if (    (strUUID[0] == '{')
+         && (strUUID[37] == '}')
+       )
+        guid = strUUID.substr(1, 36).c_str();
+    else
+        guid = strUUID.c_str();
+
+    if (guid.isEmpty())
+        throw ConfigFileError(this, N_("UUID \"%s\" has invalid format"), strUUID.c_str());
+}
+
+/**
+ * Parses the given string in str and attempts to treat it as an ISO
+ * date/time stamp to put into timestamp. Throws on errors.
+ * @param timestamp
+ * @param str
+ */
+void ConfigFileBase::parseTimestamp(RTTIMESPEC &timestamp,
+                                    const com::Utf8Str &str) const
+{
+    const char *pcsz = str.c_str();
+        //  yyyy-mm-ddThh:mm:ss
+        // "2009-07-10T11:54:03Z"
+        //  01234567890123456789
+        //            1
+    if (str.length() > 19)
+    {
+        // timezone must either be unspecified or 'Z' for UTC
+        if (    (pcsz[19])
+             && (pcsz[19] != 'Z')
+           )
+            throw ConfigFileError(this, N_("Cannot handle ISO timestamp '%s': is not UTC date"), str.c_str());
+
+        int32_t yyyy;
+        uint32_t mm, dd, hh, min, secs;
+        if (    (pcsz[4] == '-')
+             && (pcsz[7] == '-')
+             && (pcsz[10] == 'T')
+             && (pcsz[13] == ':')
+             && (pcsz[16] == ':')
+           )
+        {
+            int rc;
+            if (    (RT_SUCCESS(rc = RTStrToInt32Ex(pcsz, NULL, 0, &yyyy)))
+                        // could theoretically be negative but let's assume that nobody
+                        // created virtual machines before the Christian era
+                 && (RT_SUCCESS(rc = RTStrToUInt32Ex(pcsz + 5, NULL, 0, &mm)))
+                 && (RT_SUCCESS(rc = RTStrToUInt32Ex(pcsz + 8, NULL, 0, &dd)))
+                 && (RT_SUCCESS(rc = RTStrToUInt32Ex(pcsz + 11, NULL, 0, &hh)))
+                 && (RT_SUCCESS(rc = RTStrToUInt32Ex(pcsz + 14, NULL, 0, &min)))
+                 && (RT_SUCCESS(rc = RTStrToUInt32Ex(pcsz + 17, NULL, 0, &secs)))
+               )
+            {
+                RTTIME time = { yyyy,
+                                (uint8_t)mm,
+                                0,
+                                0,
+                                (uint8_t)dd,
+                                (uint8_t)hh,
+                                (uint8_t)min,
+                                (uint8_t)secs,
+                                0,
+                                RTTIME_FLAGS_TYPE_UTC };
+                if (RTTimeNormalize(&time))
+                    if (RTTimeImplode(&timestamp, &time))
+                        return;
+            }
+
+            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());
+    }
+}
+
+/**
+ * Helper to create a string for a RTTIMESPEC for writing out ISO timestamps.
+ * @param stamp
+ * @return
+ */
+com::Utf8Str ConfigFileBase::makeString(const RTTIMESPEC &stamp)
+{
+    RTTIME time;
+    if (!RTTimeExplode(&time, &stamp))
+        throw ConfigFileError(this, N_("Timespec %lld ms is invalid"), RTTimeSpecGetMilli(&stamp));
+
+    return Utf8StrFmt("%04ld-%02hd-%02hdT%02hd:%02hd:%02hdZ",
+                      time.i32Year,
+                      (uint16_t)time.u8Month,
+                      (uint16_t)time.u8MonthDay,
+                      (uint16_t)time.u8Hour,
+                      (uint16_t)time.u8Minute,
+                      (uint16_t)time.u8Second);
+}
+
+com::Utf8Str ConfigFileBase::makeString(const Guid &guid)
+{
+    Utf8Str str("{");
+    str.append(guid.toString());
+    str.append("}");
+    return str;
+}
+
+/**
+ * Helper method to read in an ExtraData subtree and stores its contents
+ * in the given map of extradata items. Used for both main and machine
+ * extradata (MainConfigFile and MachineConfigFile).
+ * @param elmExtraData
+ * @param map
+ */
+void ConfigFileBase::readExtraData(const xml::ElementNode &elmExtraData,
+                                   ExtraDataItemsMap &map)
+{
+    xml::NodesLoop nlLevel4(elmExtraData);
+    const xml::ElementNode *pelmExtraDataItem;
+    while ((pelmExtraDataItem = nlLevel4.forAllNodes()))
+    {
+        if (pelmExtraDataItem->nameEquals("ExtraDataItem"))
+        {
+            // <ExtraDataItem name="GUI/LastWindowPostion" value="97,88,981,858"/>
+            Utf8Str strName, strValue;
+            if (    ((pelmExtraDataItem->getAttributeValue("name", strName)))
+                 && ((pelmExtraDataItem->getAttributeValue("value", strValue)))
+               )
+                map[strName] = strValue;
+            else
+                throw ConfigFileError(this, N_("ExtraDataItem element must have name and value attributes"));
+        }
+        else
+            throw ConfigFileError(this, N_("Invalid element %s in ExtraData section"), pelmExtraDataItem->getName());
+    }
+}
+
+/**
+ * Reads <USBDeviceFilter> entries from under the given elmDeviceFilters node and
+ * stores them in the given linklist. This is in ConfigFileBase because it's used
+ * from both MainConfigFile (for host filters) and MachineConfigFile (for machine
+ * filters).
+ * @param elmDeviceFilters
+ * @param ll
+ */
+void ConfigFileBase::readUSBDeviceFilters(const xml::ElementNode &elmDeviceFilters,
+                                          USBDeviceFiltersList &ll)
+{
+    xml::NodesLoop nl1(elmDeviceFilters, "DeviceFilter");
+    const xml::ElementNode *pelmLevel4Child;
+    while ((pelmLevel4Child = nl1.forAllNodes()))
+    {
+        USBDeviceFilter flt;
+        flt.action = USBDeviceFilterAction_Ignore;
+        Utf8Str strAction;
+        if (    (pelmLevel4Child->getAttributeValue("name", flt.strName))
+             && (pelmLevel4Child->getAttributeValue("active", flt.fActive))
+           )
+        {
+            pelmLevel4Child->getAttributeValue("vendorId", flt.strVendorId);
+            pelmLevel4Child->getAttributeValue("productId", flt.strProductId);
+            pelmLevel4Child->getAttributeValue("revision", flt.strRevision);
+            pelmLevel4Child->getAttributeValue("manufacturer", flt.strManufacturer);
+            pelmLevel4Child->getAttributeValue("product", flt.strProduct);
+            pelmLevel4Child->getAttributeValue("serialNumber", flt.strSerialNumber);
+            pelmLevel4Child->getAttributeValue("port", flt.strPort);
+
+            // the next 2 are irrelevant for host USB objects
+            pelmLevel4Child->getAttributeValue("remote", flt.strRemote);
+            pelmLevel4Child->getAttributeValue("maskedInterfaces", flt.ulMaskedInterfaces);
+
+            // action is only used with host USB objects
+            if (pelmLevel4Child->getAttributeValue("action", strAction))
+            {
+                if (strAction == "Ignore")
+                    flt.action = USBDeviceFilterAction_Ignore;
+                else if (strAction == "Hold")
+                    flt.action = USBDeviceFilterAction_Hold;
+                else
+                    throw ConfigFileError(this, N_("Invalid value %s in DeviceFilter/action attribute"), strAction.c_str());
+            }
+
+            ll.push_back(flt);
+        }
+    }
+}
+
+/**
+ * Creates a new stub xml::Document in the m->pDoc member with the
+ * root "VirtualBox" element set up. This is used by both
+ * MainConfigFile and MachineConfigFile when writing out their XML.
+ */
+void ConfigFileBase::createStubDocument()
+{
+    Assert(m->pDoc == NULL);
+    m->pDoc = new xml::Document;
+
+    m->pelmRoot = m->pDoc->createRootElement("VirtualBox");
+    m->pelmRoot->setAttribute("xmlns", VBOX_XML_NAMESPACE);
+
+    const char *pcszVersion;
+    switch (m->sv)
+    {
+        case SettingsVersion_v1_7:
+            pcszVersion = "1.7";
+        break;
+        case SettingsVersion_v1_8:
+            pcszVersion = "1.8";
+        break;
+    }
+    m->pelmRoot->setAttribute("version", Utf8StrFmt("%s-%s",
+                                                    pcszVersion,
+                                                    VBOX_XML_PLATFORM));       // e.g. "linux"
+}
+
+/**
+ *
+ * @param elmParent
+ * @param me
+ */
+void ConfigFileBase::writeExtraData(xml::ElementNode &elmParent,
+                                    const ExtraDataItemsMap &me)
+{
+    if (me.size())
+    {
+        xml::ElementNode *pelmExtraData = elmParent.createChild("ExtraData");
+        for (ExtraDataItemsMap::const_iterator it = me.begin();
+             it != me.end();
+             ++it)
+        {
+            const Utf8Str &strName = it->first;
+            const Utf8Str &strValue = it->second;
+            xml::ElementNode *pelmThis = pelmExtraData->createChild("ExtraDataItem");
+            pelmThis->setAttribute("name", strName);
+            pelmThis->setAttribute("value", strValue);
+        }
+    }
+}
+
+/**
+ * Creates <DeviceFilter> nodes under the given parent element according to
+ * the contents of the given USBDeviceFiltersList. If fHostMode is true,
+ * this means that we're supposed to write filters for the IHost interface
+ * (respect "action", omit "strRemote" and "ulMaskedInterfaces" in
+ * struct USBDeviceFilter).
+ * @param elmParent
+ * @param ll
+ * @param fHostMode
+ */
+void ConfigFileBase::writeUSBDeviceFilters(xml::ElementNode &elmParent,
+                                           const USBDeviceFiltersList &ll,
+                                           bool fHostMode)
+{
+    for (USBDeviceFiltersList::const_iterator it = ll.begin();
+         it != ll.end();
+         ++it)
+    {
+        const USBDeviceFilter &flt = *it;
+        xml::ElementNode *pelmFilter = elmParent.createChild("DeviceFilter");
+        pelmFilter->setAttribute("name", flt.strName);
+        pelmFilter->setAttribute("active", flt.fActive);
+        if (flt.strVendorId.length())
+            pelmFilter->setAttribute("vendorId", flt.strVendorId);
+        if (flt.strProductId.length())
+            pelmFilter->setAttribute("productId", flt.strProductId);
+        if (flt.strRevision.length())
+            pelmFilter->setAttribute("revision", flt.strRevision);
+        if (flt.strManufacturer.length())
+            pelmFilter->setAttribute("manufacturer", flt.strManufacturer);
+        if (flt.strProduct.length())
+            pelmFilter->setAttribute("product", flt.strProduct);
+        if (flt.strSerialNumber.length())
+            pelmFilter->setAttribute("serialNumber", flt.strSerialNumber);
+        if (flt.strPort.length())
+            pelmFilter->setAttribute("port", flt.strPort);
+
+        if (fHostMode)
+        {
+            const char *pcsz =
+                (flt.action == USBDeviceFilterAction_Ignore) ? "Ignore"
+                : /*(flt.action == USBDeviceFilterAction_Hold) ?*/ "Hold";
+            pelmFilter->setAttribute("action", pcsz);
+        }
+        else
+        {
+            if (flt.strRemote.length())
+                pelmFilter->setAttribute("remote", flt.strRemote);
+            if (flt.ulMaskedInterfaces)
+                pelmFilter->setAttribute("maskedInterfaces", flt.ulMaskedInterfaces);
+        }
+    }
+}
+
+/**
+ * Cleans up memory allocated by the internal XML parser. To be called by
+ * descendant classes when they're done analyzing the DOM tree to discard it.
+ */
+void ConfigFileBase::clearDocument()
+{
+    m->cleanup();
+}
+
+/**
+ * Returns true only if the underlying config file exists on disk;
+ * either because the file has been loaded from disk, or it's been written
+ * to disk, or both.
+ * @return
+ */
+bool ConfigFileBase::fileExists()
+{
+    return m->fFileExists;
+}
+
+/**
+ * Reads one <MachineEntry> from the main VirtualBox.xml file.
+ * @param elmMachineRegistry
+ */
+void MainConfigFile::readMachineRegistry(const xml::ElementNode &elmMachineRegistry)
+{
+    // <MachineEntry uuid="{ xxx }" src="   xxx "/>
+    xml::NodesLoop nl1(elmMachineRegistry);
+    const xml::ElementNode *pelmChild1;
+    while ((pelmChild1 = nl1.forAllNodes()))
+    {
+        if (pelmChild1->nameEquals("MachineEntry"))
+        {
+            MachineRegistryEntry mre;
+            Utf8Str strUUID;
+            if (    ((pelmChild1->getAttributeValue("uuid", strUUID)))
+                 && ((pelmChild1->getAttributeValue("src", mre.strSettingsFile)))
+               )
+            {
+                parseUUID(mre.uuid, strUUID);
+                llMachines.push_back(mre);
+            }
+            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());
+    }
+}
+
+/**
+ * Reads a media registry entry from the main VirtualBox.xml file.
+ * @param t
+ * @param elmMedium
+ * @param llMedia
+ */
+void MainConfigFile::readMedium(MediaType t,
+                                const xml::ElementNode &elmMedium,  // MediaRegistry/HardDisks or a single HardDisk node if recursing
+                                MediaList &llMedia)
+{
+    // <HardDisk uuid="{5471ecdb-1ddb-4012-a801-6d98e226868b}" location="/mnt/innotek-unix/vdis/Windows XP.vdi" format="VDI" type="Normal">
+    settings::Medium med;
+    Utf8Str strUUID;
+    if (    (elmMedium.getAttributeValue("uuid", strUUID))
+         && (elmMedium.getAttributeValue("location", med.strLocation))
+       )
+    {
+        parseUUID(med.uuid, strUUID);
+        elmMedium.getAttributeValue("Description", med.strDescription);       // optional
+
+        if (t == HardDisk)
+        {
+            if (!(elmMedium.getAttributeValue("format", med.strFormat)))
+                throw ConfigFileError(this, N_("HardDisk element must have format attribute"));
+
+            if (!(elmMedium.getAttributeValue("autoReset", med.fAutoReset)))
+                med.fAutoReset = false;
+
+            Utf8Str strType;
+            if ((elmMedium.getAttributeValue("type", strType)))
+            {
+                if (strType == "Normal")
+                    med.hdType = HardDiskType_Normal;
+                else if (strType == "Immutable")
+                    med.hdType = HardDiskType_Immutable;
+                else if (strType == "Writethrough")
+                    med.hdType = HardDiskType_Writethrough;
+                else
+                    throw ConfigFileError(this, N_("HardDisk/type attribute must be one of Normal, Immutable or Writethrough"));
+            }
+        }
+
+        // recurse to handle children
+        xml::NodesLoop nl2(elmMedium);
+        const xml::ElementNode *pelmHDChild;
+        while ((pelmHDChild = nl2.forAllNodes()))
+        {
+            if (    t == HardDisk
+                 && (pelmHDChild->nameEquals("HardDisk"))
+               )
+                // recurse with this element and push the child onto our current children list
+                readMedium(t,
+                           *pelmHDChild,
+                           med.llChildren);
+            else if (pelmHDChild->nameEquals("Property"))
+            {
+                Utf8Str strPropName, strPropValue;
+                if (    (pelmHDChild->getAttributeValue("name", strPropName))
+                     && (pelmHDChild->getAttributeValue("value", strPropValue))
+                   )
+                    med.properties[strPropName] = strPropValue;
+                else
+                    throw ConfigFileError(this, N_("HardDisk/Property element must have name and value attributes"));
+            }
+        }
+
+        llMedia.push_back(med);
+    }
+    else
+        throw ConfigFileError(this, N_("%s element must have uuid and location attributes"), elmMedium.getName());
+}
+
+/**
+ * Reads in the entire <MediaRegistry> chunk.
+ * @param elmMediaRegistry
+ */
+void MainConfigFile::readMediaRegistry(const xml::ElementNode &elmMediaRegistry)
+{
+    // <MachineEntry uuid="{ xxx }" src="   xxx "/>
+    xml::NodesLoop nl1(elmMediaRegistry);
+    const xml::ElementNode *pelmChild1;
+    while ((pelmChild1 = nl1.forAllNodes()))
+    {
+        MediaType t = Error;
+        if (pelmChild1->nameEquals("HardDisks"))
+            t = HardDisk;
+        else if (pelmChild1->nameEquals("DVDImages"))
+            t = DVDImage;
+        else if (pelmChild1->nameEquals("FloppyImages"))
+            t = FloppyImage;
+        else
+            throw ConfigFileError(this, N_("Invalid element %s in MediaRegistry section"), pelmChild1->getName());
+
+        xml::NodesLoop nl1(*pelmChild1);
+        const xml::ElementNode *pelmMedium;
+        while ((pelmMedium = nl1.forAllNodes()))
+        {
+            if (    t == HardDisk
+                 && (pelmMedium->nameEquals("HardDisk"))
+               )
+                readMedium(t,
+                           *pelmMedium,
+                           llHardDisks);      // list to append hard disk data to: the root list
+            else if (    t == DVDImage
+                      && (pelmMedium->nameEquals("Image"))
+                    )
+                readMedium(t,
+                           *pelmMedium,
+                           llDvdImages);      // list to append dvd images to: the root list
+            else if (    t == FloppyImage
+                      && (pelmMedium->nameEquals("Image"))
+                    )
+                readMedium(t,
+                           *pelmMedium,
+                           llFloppyImages);      // list to append floppy images to: the root list
+        }
+    }
+}
+
+/**
+ * Reads in the <DHCPServers> chunk.
+ * @param elmDHCPServers
+ */
+void MainConfigFile::readDHCPServers(const xml::ElementNode &elmDHCPServers)
+{
+    xml::NodesLoop nl1(elmDHCPServers);
+    const xml::ElementNode *pelmServer;
+    while ((pelmServer = nl1.forAllNodes()))
+    {
+        if (pelmServer->nameEquals("DHCPServer"))
+        {
+            DHCPServer srv;
+            if (    (pelmServer->getAttributeValue("networkName", srv.strNetworkName))
+                 && (pelmServer->getAttributeValue("IPAddress", srv.strIPAddress))
+                 && (pelmServer->getAttributeValue("networkMask", srv.strIPNetworkMask))
+                 && (pelmServer->getAttributeValue("lowerIP", srv.strIPLower))
+                 && (pelmServer->getAttributeValue("upperIP", srv.strIPUpper))
+                 && (pelmServer->getAttributeValue("enabled", srv.fEnabled))
+               )
+                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());
+    }
+}
+
+/**
+ * Constructor.
+ *
+ * If pstrFilename is != NULL, this reads the given settings file into the member
+ * variables and various substructures and lists. Otherwise, the member variables
+ * are initialized with default values.
+ *
+ * Throws variants of xml::Error for I/O, XML and logical content errors, which
+ * the caller should catch; if this constructor does not throw, then the file has
+ * been successfully read.
+ *
+ * @param strFilename
+ */
+MainConfigFile::MainConfigFile(const Utf8Str *pstrFilename)
+    : ConfigFileBase(pstrFilename)
+{
+    if (pstrFilename)
+    {
+        // the ConfigFileBase constructor has loaded the XML file, so now
+        // we need only analyze what is in there
+        xml::NodesLoop nlRootChildren(*m->pelmRoot);
+        const xml::ElementNode *pelmRootChild;
+        while ((pelmRootChild = nlRootChildren.forAllNodes()))
+        {
+            if (pelmRootChild->nameEquals("Global"))
+            {
+                xml::NodesLoop nlGlobalChildren(*pelmRootChild);
+                const xml::ElementNode *pelmGlobalChild;
+                while ((pelmGlobalChild = nlGlobalChildren.forAllNodes()))
+                {
+                    if (pelmGlobalChild->nameEquals("SystemProperties"))
+                    {
+                        pelmGlobalChild->getAttributeValue("defaultMachineFolder", systemProperties.strDefaultMachineFolder);
+                        pelmGlobalChild->getAttributeValue("defaultHardDiskFolder", systemProperties.strDefaultHardDiskFolder);
+                        pelmGlobalChild->getAttributeValue("defaultHardDiskFormat", systemProperties.strDefaultHardDiskFormat);
+                        pelmGlobalChild->getAttributeValue("remoteDisplayAuthLibrary", systemProperties.strRemoteDisplayAuthLibrary);
+                        pelmGlobalChild->getAttributeValue("webServiceAuthLibrary", systemProperties.strWebServiceAuthLibrary);
+                        pelmGlobalChild->getAttributeValue("LogHistoryCount", systemProperties.ulLogHistoryCount);
+                    }
+                    else if (pelmGlobalChild->nameEquals("ExtraData"))
+                        readExtraData(*pelmGlobalChild, mapExtraDataItems);
+                    else if (pelmGlobalChild->nameEquals("MachineRegistry"))
+                        readMachineRegistry(*pelmGlobalChild);
+                    else if (pelmGlobalChild->nameEquals("MediaRegistry"))
+                        readMediaRegistry(*pelmGlobalChild);
+                    else if (pelmGlobalChild->nameEquals("NetserviceRegistry"))
+                    {
+                        xml::NodesLoop nlLevel4(*pelmGlobalChild);
+                        const xml::ElementNode *pelmLevel4Child;
+                        while ((pelmLevel4Child = nlLevel4.forAllNodes()))
+                        {
+                            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"))
+        }
+
+        clearDocument();
+    }
+}
+
+/**
+ * Writes out a single <HardDisk> element for the given Medium structure
+ * and recurses to write the child hard disks underneath. Called from
+ * MainConfigFile::write().
+ * @param elmMedium
+ * @param m
+ * @param level
+ */
+void MainConfigFile::writeHardDisk(xml::ElementNode &elmMedium,
+                                   const Medium &m,
+                                   uint32_t level)          // 0 for "root" call, incremented with each recursion
+{
+    xml::ElementNode *pelmHardDisk = elmMedium.createChild("HardDisk");
+    pelmHardDisk->setAttribute("uuid", makeString(m.uuid));
+    pelmHardDisk->setAttribute("location", m.strLocation);
+    pelmHardDisk->setAttribute("format", m.strFormat);
+    if (m.fAutoReset)
+        pelmHardDisk->setAttribute("autoReset", m.fAutoReset);
+    if (m.strDescription.length())
+        pelmHardDisk->setAttribute("Description", m.strDescription);
+
+    for (PropertiesMap::const_iterator it = m.properties.begin();
+         it != m.properties.end();
+         ++it)
+    {
+        xml::ElementNode *pelmProp = pelmHardDisk->createChild("Property");
+        pelmProp->setAttribute("name", it->first);
+        pelmProp->setAttribute("value", it->second);
+    }
+
+    // only for base hard disks, save the type
+    if (level == 0)
+    {
+        const char *pcszType =
+            m.hdType == HardDiskType_Normal ? "Normal" :
+            m.hdType == HardDiskType_Immutable ? "Immutable" :
+            /*m.hdType == HardDiskType_Writethrough ?*/ "Writethrough";
+        pelmHardDisk->setAttribute("type", pcszType);
+    }
+
+    for (MediaList::const_iterator it = m.llChildren.begin();
+         it != m.llChildren.end();
+         ++it)
+    {
+        // recurse for children
+        writeHardDisk(*pelmHardDisk, // parent
+                      *it,           // settings::Medium
+                      ++level);      // recursion level
+    }
+}
+
+/**
+ * Called from the IMachine interface to write out a machine config file. This
+ * builds an XML DOM tree and writes it out to disk.
+ */
+void MainConfigFile::write()
+{
+    createStubDocument();
+
+    xml::ElementNode *pelmGlobal = m->pelmRoot->createChild("Global");
+
+    writeExtraData(*pelmGlobal, mapExtraDataItems);
+
+    xml::ElementNode *pelmMachineRegistry = pelmGlobal->createChild("MachineRegistry");
+    for (MachinesRegistry::const_iterator it = llMachines.begin();
+         it != llMachines.end();
+         ++it)
+    {
+        // <MachineEntry uuid="{5f102a55-a51b-48e3-b45a-b28d33469488}" src="/mnt/innotek-unix/vbox-machines/Windows 5.1 XP 1 (Office 2003)/Windows 5.1 XP 1 (Office 2003).xml"/>
+        const MachineRegistryEntry &mre = *it;
+        xml::ElementNode *pelmMachineEntry = pelmMachineRegistry->createChild("MachineEntry");
+        pelmMachineEntry->setAttribute("uuid", makeString(mre.uuid));
+        pelmMachineEntry->setAttribute("src", mre.strSettingsFile);
+    }
+
+    xml::ElementNode *pelmMediaRegistry = pelmGlobal->createChild("MediaRegistry");
+
+    xml::ElementNode *pelmHardDisks = pelmMediaRegistry->createChild("HardDisks");
+    for (MediaList::const_iterator it = llHardDisks.begin();
+         it != llHardDisks.end();
+         ++it)
+    {
+        writeHardDisk(*pelmHardDisks, *it, 0);
+    }
+
+    xml::ElementNode *pelmDVDImages = pelmMediaRegistry->createChild("DVDImages");
+    for (MediaList::const_iterator it = llDvdImages.begin();
+         it != llDvdImages.end();
+         ++it)
+    {
+        const Medium &m = *it;
+        xml::ElementNode *pelmMedium = pelmDVDImages->createChild("Image");
+        pelmMedium->setAttribute("uuid", makeString(m.uuid));
+        pelmMedium->setAttribute("location", m.strLocation);
+        if (m.strDescription.length())
+            pelmMedium->setAttribute("Description", m.strDescription);
+    }
+
+    xml::ElementNode *pelmFloppyImages = pelmMediaRegistry->createChild("FloppyImages");
+    for (MediaList::const_iterator it = llFloppyImages.begin();
+         it != llFloppyImages.end();
+         ++it)
+    {
+        const Medium &m = *it;
+        xml::ElementNode *pelmMedium = pelmFloppyImages->createChild("Image");
+        pelmMedium->setAttribute("uuid", makeString(m.uuid));
+        pelmMedium->setAttribute("location", m.strLocation);
+        if (m.strDescription.length())
+            pelmMedium->setAttribute("Description", m.strDescription);
+    }
+
+    xml::ElementNode *pelmNetserviceRegistry = pelmGlobal->createChild("NetserviceRegistry");
+    xml::ElementNode *pelmDHCPServers = pelmNetserviceRegistry->createChild("DHCPServers");
+    for (DHCPServersList::const_iterator it = llDhcpServers.begin();
+         it != llDhcpServers.end();
+         ++it)
+    {
+        const DHCPServer &d = *it;
+        xml::ElementNode *pelmThis = pelmDHCPServers->createChild("DHCPServer");
+        pelmThis->setAttribute("networkName", d.strNetworkName);
+        pelmThis->setAttribute("IPAddress", d.strIPAddress);
+        pelmThis->setAttribute("networkMask", d.strIPNetworkMask);
+        pelmThis->setAttribute("lowerIP", d.strIPLower);
+        pelmThis->setAttribute("upperIP", d.strIPUpper);
+        pelmThis->setAttribute("enabled", (d.fEnabled) ? 1 : 0);        // too bad we chose 1 vs. 0 here
+    }
+
+    xml::ElementNode *pelmSysProps = pelmGlobal->createChild("SystemProperties");
+    if (systemProperties.strDefaultMachineFolder.length())
+        pelmSysProps->setAttribute("defaultMachineFolder", systemProperties.strDefaultMachineFolder);
+    if (systemProperties.strDefaultHardDiskFolder.length())
+        pelmSysProps->setAttribute("defaultHardDiskFolder", systemProperties.strDefaultHardDiskFolder);
+    if (systemProperties.strDefaultHardDiskFormat.length())
+        pelmSysProps->setAttribute("defaultHardDiskFormat", systemProperties.strDefaultHardDiskFormat);
+    if (systemProperties.strRemoteDisplayAuthLibrary.length())
+        pelmSysProps->setAttribute("remoteDisplayAuthLibrary", systemProperties.strRemoteDisplayAuthLibrary);
+    if (systemProperties.strWebServiceAuthLibrary.length())
+        pelmSysProps->setAttribute("webServiceAuthLibrary", systemProperties.strWebServiceAuthLibrary);
+    pelmSysProps->setAttribute("LogHistoryCount", systemProperties.ulLogHistoryCount);
+
+    writeUSBDeviceFilters(*pelmGlobal->createChild("USBDeviceFilters"),
+                          host.llUSBDeviceFilters,
+                          true);               // fHostMode
+
+    // now go write the XML
+    xml::XmlFileWriter writer(*m->pDoc);
+    writer.write(m->strFilename.c_str());
+
+    m->fFileExists = true;
+
+    clearDocument();
+}
+
+/**
+ * @param elmNetwork
+ * @param ll
+ */
+void MachineConfigFile::readNetworkAdapters(const xml::ElementNode &elmNetwork,
+                                            NetworkAdaptersList &ll)
+{
+    xml::NodesLoop nl1(elmNetwork, "Adapter");
+    const xml::ElementNode *pelmAdapter;
+    while ((pelmAdapter = nl1.forAllNodes()))
+    {
+        NetworkAdapter nic;
+
+        if (!pelmAdapter->getAttributeValue("slot", nic.ulSlot))
+            throw ConfigFileError(this, N_("Required Adapter/slot attribute is missing"));
+
+        Utf8Str strTemp;
+        if (pelmAdapter->getAttributeValue("type", strTemp))
+        {
+            if (strTemp == "Am79C970A")
+                nic.type = NetworkAdapterType_Am79C970A;
+            else if (strTemp == "Am79C973")
+                nic.type = NetworkAdapterType_Am79C973;
+            else if (strTemp == "82540EM")
+                nic.type = NetworkAdapterType_I82540EM;
+            else if (strTemp == "82543GC")
+                nic.type = NetworkAdapterType_I82543GC;
+            else if (strTemp == "82545EM")
+                nic.type = NetworkAdapterType_I82545EM;
+            else
+                throw ConfigFileError(this, N_("Invalid value %s in Adapter/type attribute"), strTemp.c_str());
+        }
+
+        pelmAdapter->getAttributeValue("enabled", nic.fEnabled);
+        pelmAdapter->getAttributeValue("MACAddress", nic.strMACAddress);
+        pelmAdapter->getAttributeValue("cable", nic.fCableConnected);
+        pelmAdapter->getAttributeValue("speed", nic.ulLineSpeed);
+        pelmAdapter->getAttributeValue("trace", nic.fTraceEnabled);
+        pelmAdapter->getAttributeValue("tracefile", nic.strTraceFile);
+
+        const xml::ElementNode *pelmAdapterChild;
+        if ((pelmAdapterChild = pelmAdapter->findChildElement("NAT")))
+        {
+            nic.mode = NetworkAttachmentType_NAT;
+            pelmAdapterChild->getAttributeValue("name", nic.strName);    // optional network name
+        }
+        else if (    ((pelmAdapterChild = pelmAdapter->findChildElement("HostInterface")))
+                  || ((pelmAdapterChild = pelmAdapter->findChildElement("BridgedInterface")))
+                )
+        {
+            nic.mode = NetworkAttachmentType_Bridged;
+            pelmAdapterChild->getAttributeValue("name", nic.strName);    // optional host interface name
+        }
+        else if ((pelmAdapterChild = pelmAdapter->findChildElement("InternalNetwork")))
+        {
+            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"));
+        }
+        else if ((pelmAdapterChild = pelmAdapter->findChildElement("HostOnlyInterface")))
+        {
+            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"));
+        }
+        // else: default is NetworkAttachmentType_Null
+
+        ll.push_back(nic);
+    }
+}
+
+/**
+ * Called from MachineConfigFile::readHardware() to read serial port information.
+ * @param elmUART
+ * @param ll
+ */
+void MachineConfigFile::readSerialPorts(const xml::ElementNode &elmUART,
+                                        SerialPortsList &ll)
+{
+    xml::NodesLoop nl1(elmUART, "Port");
+    const xml::ElementNode *pelmPort;
+    while ((pelmPort = nl1.forAllNodes()))
+    {
+        SerialPort port;
+        if (!pelmPort->getAttributeValue("slot", port.ulSlot))
+            throw ConfigFileError(this, N_("Required UART/Port/slot attribute is missing"));
+
+        // slot must be unique
+        for (SerialPortsList::const_iterator it = ll.begin();
+             it != ll.end();
+             ++it)
+            if ((*it).ulSlot == 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"));
+        if (!pelmPort->getAttributeValue("IOBase", port.ulIOBase))
+            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"));
+
+        Utf8Str strPortMode;
+        if (!pelmPort->getAttributeValue("hostMode", strPortMode))
+            throw ConfigFileError(this, N_("Required UART/Port/hostMode attribute is missing"));
+        if (strPortMode == "RawFile")
+            port.portMode = PortMode_RawFile;
+        else if (strPortMode == "HostPipe")
+            port.portMode = PortMode_HostPipe;
+        else if (strPortMode == "HostDevice")
+            port.portMode = PortMode_HostDevice;
+        else if (strPortMode == "Disconnected")
+            port.portMode = PortMode_Disconnected;
+        else
+            throw ConfigFileError(this, N_("Invalid value %s in UART/Port/hostMode attribute"), strPortMode.c_str());
+
+        pelmPort->getAttributeValue("path", port.strPath);
+        pelmPort->getAttributeValue("server", port.fServer);
+
+        ll.push_back(port);
+    }
+}
+
+/**
+ * Called from MachineConfigFile::readHardware() to read parallel port information.
+ * @param elmLPT
+ * @param ll
+ */
+void MachineConfigFile::readParallelPorts(const xml::ElementNode &elmLPT,
+                                          ParallelPortsList &ll)
+{
+    xml::NodesLoop nl1(elmLPT, "Port");
+    const xml::ElementNode *pelmPort;
+    while ((pelmPort = nl1.forAllNodes()))
+    {
+        ParallelPort port;
+        if (!pelmPort->getAttributeValue("slot", port.ulSlot))
+            throw ConfigFileError(this, N_("Required LPT/Port/slot attribute is missing"));
+
+        // slot must be unique
+        for (ParallelPortsList::const_iterator it = ll.begin();
+             it != ll.end();
+             ++it)
+            if ((*it).ulSlot == 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"));
+        if (!pelmPort->getAttributeValue("IOBase", port.ulIOBase))
+            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"));
+
+        pelmPort->getAttributeValue("path", port.strPath);
+
+        ll.push_back(port);
+    }
+}
+
+/**
+ * Called from MachineConfigFile::readHardware() to read guest property information.
+ * @param elmGuestProperties
+ * @param hw
+ */
+void MachineConfigFile::readGuestProperties(const xml::ElementNode &elmGuestProperties,
+                                            Hardware &hw)
+{
+    xml::NodesLoop nl1(elmGuestProperties, "GuestProperty");
+    const xml::ElementNode *pelmProp;
+    while ((pelmProp = nl1.forAllNodes()))
+    {
+        GuestProperty prop;
+        pelmProp->getAttributeValue("name", prop.strName);
+        pelmProp->getAttributeValue("value", prop.strValue);
+
+        pelmProp->getAttributeValue("timestamp", prop.timestamp);
+        pelmProp->getAttributeValue("flags", prop.strFlags);
+        hw.llGuestProperties.push_back(prop);
+    }
+
+    elmGuestProperties.getAttributeValue("notificationPatterns", hw.strNotificationPatterns);
+}
+
+/**
+ * Reads in a <Hardware> block and stores it in the given structure. Used
+ * both directly from readMachine and from readSnapshot, since snapshots
+ * have their own hardware sections.
+ * @param elmHardware
+ * @param hw
+ */
+void MachineConfigFile::readHardware(const xml::ElementNode &elmHardware,
+                                     Hardware &hw)
+{
+    elmHardware.getAttributeValue("version", hw.strVersion);
+            // defaults to 2 and is only written if != 2
+
+    xml::NodesLoop nl1(elmHardware);
+    const xml::ElementNode *pelmHwChild;
+    while ((pelmHwChild = nl1.forAllNodes()))
+    {
+        if (pelmHwChild->nameEquals("CPU"))
+        {
+            pelmHwChild->getAttributeValue("count", hw.cCPUs);
+
+            const xml::ElementNode *pelmCPUChild;
+            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtEx")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fHardwareVirt);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExNestedPaging")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fNestedPaging);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExVPID")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fVPID);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("PAE")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fPAE);
+        }
+        else if (pelmHwChild->nameEquals("Memory"))
+            pelmHwChild->getAttributeValue("RAMSize", hw.ulMemorySizeMB);
+        else if (pelmHwChild->nameEquals("Boot"))
+        {
+            xml::NodesLoop nl2(*pelmHwChild, "Order");
+            const xml::ElementNode *pelmOrder;
+            while ((pelmOrder = nl2.forAllNodes()))
+            {
+                uint32_t ulPos;
+                Utf8Str strDevice;
+                if (!pelmOrder->getAttributeValue("position", ulPos))
+                    throw ConfigFileError(this, N_("'Order' element lacks 'position' attribute"));
+                if (!pelmOrder->getAttributeValue("device", strDevice))
+                    throw ConfigFileError(this, N_("'Order' element lacks 'device' attribute"));
+                if (hw.mapBootOrder.find(ulPos) != hw.mapBootOrder.end())
+                    throw ConfigFileError(this, N_("Value %d of 'position' attribute in 'Order' element is not unique"), ulPos);
+
+                DeviceType_T type;
+                if (strDevice == "None")
+                    type = DeviceType_Null;
+                else if (strDevice == "Floppy")
+                    type = DeviceType_Floppy;
+                else if (strDevice == "DVD")
+                    type = DeviceType_DVD;
+                else if (strDevice == "HardDisk")
+                    type = DeviceType_HardDisk;
+                else if (strDevice == "Network")
+                    type = DeviceType_Network;
+                else
+                    throw ConfigFileError(this, N_("Invalid value %s in Boot/Order/device attribute"), strDevice.c_str());
+                hw.mapBootOrder[ulPos] = type;
+            }
+        }
+        else if (pelmHwChild->nameEquals("Display"))
+        {
+            pelmHwChild->getAttributeValue("VRAMSize", hw.ulVRAMSizeMB);
+            pelmHwChild->getAttributeValue("monitorCount", hw.cMonitors);
+            pelmHwChild->getAttributeValue("accelerate3D", hw.fAccelerate3D);
+            pelmHwChild->getAttributeValue("accelerate2DVideo", hw.fAccelerate2DVideo);
+        }
+        else if (pelmHwChild->nameEquals("RemoteDisplay"))
+        {
+            pelmHwChild->getAttributeValue("enabled", hw.vrdpSettings.fEnabled);
+            pelmHwChild->getAttributeValue("port", hw.vrdpSettings.ulPort);
+            pelmHwChild->getAttributeValue("netAddress", hw.vrdpSettings.strNetAddress);
+
+            Utf8Str strAuthType;
+            if (pelmHwChild->getAttributeValue("authType", strAuthType))
+            {
+                if (strAuthType == "Null")
+                    hw.vrdpSettings.authType = VRDPAuthType_Null;
+                else if (strAuthType == "Guest")
+                    hw.vrdpSettings.authType = VRDPAuthType_Guest;
+                else if (strAuthType == "External")
+                    hw.vrdpSettings.authType = VRDPAuthType_External;
+                else
+                    throw ConfigFileError(this, N_("Invalid value %s in RemoteDisplay/authType attribute"), strAuthType.c_str());
+            }
+
+            pelmHwChild->getAttributeValue("authTimeout", hw.vrdpSettings.ulAuthTimeout);
+            pelmHwChild->getAttributeValue("allowMultiConnection", hw.vrdpSettings.fAllowMultiConnection);
+            pelmHwChild->getAttributeValue("reuseSingleConnection", hw.vrdpSettings.fReuseSingleConnection);
+        }
+        else if (pelmHwChild->nameEquals("BIOS"))
+        {
+            const xml::ElementNode *pelmBIOSChild;
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("ACPI")))
+                pelmBIOSChild->getAttributeValue("enabled", hw.biosSettings.fACPIEnabled);
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("IOAPIC")))
+                pelmBIOSChild->getAttributeValue("enabled", hw.biosSettings.fIOAPICEnabled);
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("Logo")))
+            {
+                pelmBIOSChild->getAttributeValue("fadeIn", hw.biosSettings.fLogoFadeIn);
+                pelmBIOSChild->getAttributeValue("fadeOut", hw.biosSettings.fLogoFadeOut);
+                pelmBIOSChild->getAttributeValue("displayTime", hw.biosSettings.ulLogoDisplayTime);
+                pelmBIOSChild->getAttributeValue("imagePath", hw.biosSettings.strLogoImagePath);
+            }
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("BootMenu")))
+            {
+                Utf8Str strBootMenuMode;
+                if (pelmBIOSChild->getAttributeValue("mode", strBootMenuMode))
+                {
+                    if (strBootMenuMode == "Disabled")
+                        hw.biosSettings.biosBootMenuMode = BIOSBootMenuMode_Disabled;
+                    else if (strBootMenuMode == "MenuOnly")
+                        hw.biosSettings.biosBootMenuMode = BIOSBootMenuMode_MenuOnly;
+                    else if (strBootMenuMode == "MessageAndMenu")
+                        hw.biosSettings.biosBootMenuMode = BIOSBootMenuMode_MessageAndMenu;
+                    else
+                        throw ConfigFileError(this, N_("Invalid value %s in BootMenu/mode attribute"), strBootMenuMode.c_str());
+                }
+            }
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("PXEDebug")))
+                pelmBIOSChild->getAttributeValue("enabled", hw.biosSettings.fPXEDebugEnabled);
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("TimeOffset")))
+                pelmBIOSChild->getAttributeValue("value", hw.biosSettings.llTimeOffset);
+        }
+        else if (pelmHwChild->nameEquals("DVDDrive"))
+        {
+            const xml::ElementNode *pDriveChild;
+            pelmHwChild->getAttributeValue("passthrough", hw.dvdDrive.fPassThrough);
+            Utf8Str strTmp;
+            if (    ((pDriveChild = pelmHwChild->findChildElement("Image")))
+                 && (pDriveChild->getAttributeValue("uuid", strTmp))
+               )
+                parseUUID(hw.dvdDrive.uuid, strTmp);
+            else if ((pDriveChild = pelmHwChild->findChildElement("HostDrive")))
+                pDriveChild->getAttributeValue("src", hw.dvdDrive.strHostDriveSrc);
+        }
+        else if (pelmHwChild->nameEquals("FloppyDrive"))
+        {
+            const xml::ElementNode *pDriveChild;
+            pelmHwChild->getAttributeValue("enabled", hw.floppyDrive.fEnabled);
+            Utf8Str strTmp;
+            if (    ((pDriveChild = pelmHwChild->findChildElement("Image")))
+                 && (pDriveChild->getAttributeValue("uuid", strTmp))
+               )
+                parseUUID(hw.floppyDrive.uuid, strTmp);
+            else if ((pDriveChild = pelmHwChild->findChildElement("HostDrive")))
+                pDriveChild->getAttributeValue("src", hw.floppyDrive.strHostDriveSrc);
+        }
+        else if (pelmHwChild->nameEquals("USBController"))
+        {
+            pelmHwChild->getAttributeValue("enabled", hw.usbController.fEnabled);
+            pelmHwChild->getAttributeValue("enabledEhci", hw.usbController.fEnabledEHCI);
+
+            readUSBDeviceFilters(*pelmHwChild,
+                                 hw.usbController.llDeviceFilters);
+        }
+        else if (pelmHwChild->nameEquals("Network"))
+            readNetworkAdapters(*pelmHwChild, hw.llNetworkAdapters);
+        else if (pelmHwChild->nameEquals("UART"))
+            readSerialPorts(*pelmHwChild, hw.llSerialPorts);
+        else if (pelmHwChild->nameEquals("LPT"))
+            readParallelPorts(*pelmHwChild, hw.llParallelPorts);
+        else if (pelmHwChild->nameEquals("AudioAdapter"))
+        {
+            pelmHwChild->getAttributeValue("enabled", hw.audioAdapter.fEnabled);
+
+            Utf8Str strTemp;
+            if (pelmHwChild->getAttributeValue("controller", strTemp))
+            {
+                if (strTemp == "SB16")
+                    hw.audioAdapter.controllerType = AudioControllerType_SB16;
+                else if (strTemp == "AC97")
+                    hw.audioAdapter.controllerType = AudioControllerType_AC97;
+                else
+                    throw ConfigFileError(this, N_("Invalid value %s in AudioAdapter/controller attribute"), strTemp.c_str());
+            }
+            if (pelmHwChild->getAttributeValue("driver", strTemp))
+            {
+                if (strTemp == "Null")
+                    hw.audioAdapter.driverType = AudioDriverType_Null;
+                else if (strTemp == "WinMM")
+                    hw.audioAdapter.driverType = AudioDriverType_WinMM;
+                else if (strTemp == "DirectSound")
+                    hw.audioAdapter.driverType = AudioDriverType_DirectSound;
+                else if (strTemp == "SolAudio")
+                    hw.audioAdapter.driverType = AudioDriverType_SolAudio;
+                else if (strTemp == "ALSA")
+                    hw.audioAdapter.driverType = AudioDriverType_ALSA;
+                else if (strTemp == "Pulse")
+                    hw.audioAdapter.driverType = AudioDriverType_Pulse;
+                else if (strTemp == "OSS")
+                    hw.audioAdapter.driverType = AudioDriverType_OSS;
+                else if (strTemp == "CoreAudio")
+                    hw.audioAdapter.driverType = AudioDriverType_CoreAudio;
+                else if (strTemp == "MMPM")
+                    hw.audioAdapter.driverType = AudioDriverType_MMPM;
+                else
+                    throw ConfigFileError(this, N_("Invalid value %s in AudioAdapter/driver attribute"), strTemp.c_str());
+            }
+        }
+        else if (pelmHwChild->nameEquals("SharedFolders"))
+        {
+            xml::NodesLoop nl2(*pelmHwChild, "SharedFolder");
+            const xml::ElementNode *pelmFolder;
+            while ((pelmFolder = nl2.forAllNodes()))
+            {
+                SharedFolder sf;
+                pelmFolder->getAttributeValue("name", sf.strName);
+                pelmFolder->getAttributeValue("hostPath", sf.strHostPath);
+                pelmFolder->getAttributeValue("writable", sf.fWritable);
+                hw.llSharedFolders.push_back(sf);
+            }
+        }
+        else if (pelmHwChild->nameEquals("Clipboard"))
+        {
+            Utf8Str strTemp;
+            if (pelmHwChild->getAttributeValue("mode", strTemp))
+            {
+                if (strTemp == "Disabled")
+                    hw.clipboardMode = ClipboardMode_Disabled;
+                else if (strTemp == "HostToGuest")
+                    hw.clipboardMode = ClipboardMode_HostToGuest;
+                else if (strTemp == "GuestToHost")
+                    hw.clipboardMode = ClipboardMode_GuestToHost;
+                else if (strTemp == "Bidirectional")
+                    hw.clipboardMode = ClipboardMode_Bidirectional;
+                else
+                    throw ConfigFileError(this, N_("Invalid value %s in Clipbord/mode attribute"), strTemp.c_str());
+            }
+        }
+        else if (pelmHwChild->nameEquals("Guest"))
+        {
+            pelmHwChild->getAttributeValue("memoryBalloonSize", hw.ulMemoryBalloonSize);
+            pelmHwChild->getAttributeValue("statisticsUpdateInterval", hw.ulStatisticsUpdateInterval);
+        }
+        else if (pelmHwChild->nameEquals("GuestProperties"))
+            readGuestProperties(*pelmHwChild, hw);
+        else
+            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"));
+}
+
+/**
+ * Reads in a <StorageControllers> block and stores it in the given Storage structure.
+ * Used both directly from readMachine and from readSnapshot, since snapshots
+ * have their own storage controllers sections.
+ *
+ * @param elmStorageControllers
+ */
+void MachineConfigFile::readStorageControllers(const xml::ElementNode &elmStorageControllers,
+                                               Storage &strg)
+{
+    xml::NodesLoop nlStorageControllers(elmStorageControllers, "StorageController");
+    const xml::ElementNode *pelmController;
+    while ((pelmController = nlStorageControllers.forAllNodes()))
+    {
+        StorageController sctl;
+
+        if (!pelmController->getAttributeValue("name", sctl.strName))
+            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"));
+
+        if (strType == "AHCI")
+        {
+            sctl.storageBus = StorageBus_SATA;
+            sctl.controllerType = StorageControllerType_IntelAhci;
+        }
+        else if (strType == "LsiLogic")
+        {
+            sctl.storageBus = StorageBus_SCSI;
+            sctl.controllerType = StorageControllerType_LsiLogic;
+        }
+        else if (strType == "BusLogic")
+        {
+            sctl.storageBus = StorageBus_SCSI;
+            sctl.controllerType = StorageControllerType_BusLogic;
+        }
+        else if (strType == "PIIX3")
+        {
+            sctl.storageBus = StorageBus_IDE;
+            sctl.controllerType = StorageControllerType_PIIX3;
+        }
+        else if (strType == "PIIX4")
+        {
+            sctl.storageBus = StorageBus_IDE;
+            sctl.controllerType = StorageControllerType_PIIX4;
+        }
+        else if (strType == "ICH6")
+        {
+            sctl.storageBus = StorageBus_IDE;
+            sctl.controllerType = StorageControllerType_ICH6;
+        }
+        else
+            throw ConfigFileError(this, N_("Invalid value %s for StorageController/type attribute"), strType.c_str());
+
+        pelmController->getAttributeValue("PortCount", sctl.ulPortCount);
+
+        pelmController->getAttributeValue("IDE0MasterEmulationPort", sctl.lIDE0MasterEmulationPort);
+        pelmController->getAttributeValue("IDE0SlaveEmulationPort", sctl.lIDE0SlaveEmulationPort);
+        pelmController->getAttributeValue("IDE1MasterEmulationPort", sctl.lIDE1MasterEmulationPort);
+        pelmController->getAttributeValue("IDE1SlaveEmulationPort", sctl.lIDE1SlaveEmulationPort);
+
+        xml::NodesLoop nlAttached(*pelmController, "AttachedDevice");
+        const xml::ElementNode *pelmAttached;
+        while ((pelmAttached = nlAttached.forAllNodes()))
+        {
+            AttachedDevice att;
+
+            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);
+        }
+
+        strg.llStorageControllers.push_back(sctl);
+    }
+}
+
+/**
+ * Called initially for the <Snapshot> element under <Machine>, if present,
+ * to store the snapshot's data into the given Snapshot structure (which is
+ * then the one in the Machine struct). This might then recurse if
+ * a <Snapshots> (plural) element is found in the snapshot, which should
+ * contain a list of child snapshots; such lists are maintained in the
+ * Snapshot structure.
+ *
+ * @param elmSnapshot
+ * @param snap
+ */
+void MachineConfigFile::readSnapshot(const xml::ElementNode &elmSnapshot,
+                                     Snapshot &snap)
+{
+    Utf8Str strTemp;
+
+    if (!elmSnapshot.getAttributeValue("uuid", strTemp))
+        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"));
+
+    elmSnapshot.getAttributeValue("Description", snap.strDescription);
+
+    if (!elmSnapshot.getAttributeValue("timeStamp", strTemp))
+        throw ConfigFileError(this, N_("Required Snapshot/timeStamp attribute is missing"));
+    parseTimestamp(snap.timestamp, strTemp);
+
+    elmSnapshot.getAttributeValue("stateFile", snap.strStateFile);      // online snapshots only
+
+    xml::NodesLoop nlSnapshotChildren(elmSnapshot);
+    const xml::ElementNode *pelmSnapshotChild;
+    while ((pelmSnapshotChild = nlSnapshotChildren.forAllNodes()))
+    {
+        if (pelmSnapshotChild->nameEquals("Description"))
+            snap.strDescription = pelmSnapshotChild->getValue();
+        else if (pelmSnapshotChild->nameEquals("Hardware"))
+            readHardware(*pelmSnapshotChild, snap.hardware);
+        else if (pelmSnapshotChild->nameEquals("StorageControllers"))
+            readStorageControllers(*pelmSnapshotChild, snap.storage);
+        else if (pelmSnapshotChild->nameEquals("Snapshots"))
+        {
+            xml::NodesLoop nlChildSnapshots(*pelmSnapshotChild);
+            const xml::ElementNode *pelmChildSnapshot;
+            while ((pelmChildSnapshot = nlChildSnapshots.forAllNodes()))
+            {
+                if (pelmChildSnapshot->nameEquals("Snapshot"))
+                {
+                    Snapshot child;
+                    readSnapshot(*pelmChildSnapshot, child);
+                    snap.llChildSnapshots.push_back(child);
+                }
+                else
+                    throw ConfigFileError(this, N_("Invalid element %s under Snapshots element"), pelmChildSnapshot->getName());
+            }
+        }
+        else
+            throw ConfigFileError(this, N_("Invalid element %s under Snapshot element"), pelmSnapshotChild->getName());
+    }
+}
+
+/**
+ * Called from the constructor to actually read in the Machine element
+ * of a machine config file.
+ * @param elmMachine
+ */
+void MachineConfigFile::readMachine(const xml::ElementNode &elmMachine)
+{
+    Utf8Str strUUID;
+    if (    (elmMachine.getAttributeValue("uuid", strUUID))
+         && (elmMachine.getAttributeValue("name", strName))
+       )
+    {
+        parseUUID(uuid, strUUID);
+
+        if (!elmMachine.getAttributeValue("nameSync", fNameSync))
+            fNameSync = true;
+
+        Utf8Str str;
+        elmMachine.getAttributeValue("Description", strDescription);
+        elmMachine.getAttributeValue("OSType", strOsType);
+        elmMachine.getAttributeValue("stateFile", strStateFile);
+        if (elmMachine.getAttributeValue("currentSnapshot", str))
+            parseUUID(uuidCurrentSnapshot, str);
+        elmMachine.getAttributeValue("snapshotFolder", strSnapshotFolder);
+        if (!elmMachine.getAttributeValue("currentStateModified", fCurrentStateModified))
+            fCurrentStateModified = true;
+        if (elmMachine.getAttributeValue("lastStateChange", str))
+            parseTimestamp(timeLastStateChange, str);
+            // constructor has called RTTimeNow(&timeLastStateChange) before
+
+        xml::NodesLoop nlRootChildren(elmMachine);
+        const xml::ElementNode *pelmMachineChild;
+        while ((pelmMachineChild = nlRootChildren.forAllNodes()))
+        {
+            if (pelmMachineChild->nameEquals("ExtraData"))
+                readExtraData(*pelmMachineChild,
+                              mapExtraDataItems);
+            else if (pelmMachineChild->nameEquals("Hardware"))
+                readHardware(*pelmMachineChild, hardwareMachine);
+            else if (pelmMachineChild->nameEquals("StorageControllers"))
+                readStorageControllers(*pelmMachineChild, storageMachine);
+            else if (pelmMachineChild->nameEquals("Snapshot"))
+            {
+                Snapshot snap;
+                // this will recurse into child snapshots, if necessary
+                readSnapshot(*pelmMachineChild, snap);
+                llFirstSnapshot.push_back(snap);
+            }
+            else if (pelmMachineChild->nameEquals("Description"))
+                strDescription = pelmMachineChild->getValue();
+            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"));
+}
+
+/**
+ * Constructor.
+ *
+ * If pstrFilename is != NULL, this reads the given settings file into the member
+ * variables and various substructures and lists. Otherwise, the member variables
+ * are initialized with default values.
+ *
+ * Throws variants of xml::Error for I/O, XML and logical content errors, which
+ * the caller should catch; if this constructor does not throw, then the file has
+ * been successfully read and parsed.
+ *
+ * @param strFilename
+ */
+MachineConfigFile::MachineConfigFile(const Utf8Str *pstrFilename)
+    : ConfigFileBase(pstrFilename),
+      fNameSync(true),
+      fCurrentStateModified(true),
+      fAborted(false)
+{
+    RTTimeNow(&timeLastStateChange);
+
+    if (pstrFilename)
+    {
+        // the ConfigFileBase constructor has loaded the XML file, so now
+        // we need only analyze what is in there
+
+        xml::NodesLoop nlRootChildren(*m->pelmRoot);
+        const xml::ElementNode *pelmRootChild;
+        while ((pelmRootChild = nlRootChildren.forAllNodes()))
+        {
+            if (pelmRootChild->nameEquals("Machine"))
+                readMachine(*pelmRootChild);
+            else
+                throw ConfigFileError(this, N_("Invalid element %s under root element"), pelmRootChild->getName());
+        }
+
+        clearDocument();
+    }
+}
+
+/**
+ * Creates a <Hardware> node under elmParent and then writes out the XML
+ * keys under that. Called for both the <Machine> node and for snapshots.
+ * @param elmParent
+ * @param st
+ */
+void MachineConfigFile::writeHardware(xml::ElementNode &elmParent,
+                                      const Hardware &hw)
+{
+    xml::ElementNode *pelmHardware = elmParent.createChild("Hardware");
+
+    if (hw.strVersion != "2")
+        pelmHardware->setAttribute("version", hw.strVersion);
+
+    xml::ElementNode *pelmCPU = pelmHardware->createChild("CPU");
+    pelmCPU->createChild("HardwareVirtEx")->setAttribute("enabled", hw.fHardwareVirt);
+    if (hw.fNestedPaging)
+        pelmCPU->createChild("HardwareVirtExNestedPaging")->setAttribute("enabled", hw.fNestedPaging);
+    if (hw.fVPID)
+        pelmCPU->createChild("HardwareVirtExVPID")->setAttribute("enabled", hw.fVPID);
+    if (hw.fPAE)
+        pelmCPU->createChild("PAE")->setAttribute("enabled", hw.fPAE);
+    pelmCPU->setAttribute("count", hw.cCPUs);
+
+    xml::ElementNode *pelmMemory = pelmHardware->createChild("Memory");
+    pelmMemory->setAttribute("RAMSize", hw.ulMemorySizeMB);
+
+    xml::ElementNode *pelmBoot = pelmHardware->createChild("Boot");
+    for (BootOrderMap::const_iterator it = hw.mapBootOrder.begin();
+         it != hw.mapBootOrder.end();
+         ++it)
+    {
+        uint32_t i = it->first;
+        DeviceType_T type = it->second;
+        const char *pcszDevice;
+
+        switch (type)
+        {
+            case DeviceType_Floppy:     pcszDevice = "Floppy"; break;
+            case DeviceType_DVD:        pcszDevice = "DVD"; break;
+            case DeviceType_HardDisk:   pcszDevice = "HardDisk"; break;
+            case DeviceType_Network:    pcszDevice = "Network"; break;
+            default: /*case DeviceType_Null:*/      pcszDevice = "None"; break;
+        }
+
+        xml::ElementNode *pelmOrder = pelmBoot->createChild("Order");
+        pelmOrder->setAttribute("position", i);
+        pelmOrder->setAttribute("device", pcszDevice);
+    }
+
+    xml::ElementNode *pelmDisplay = pelmHardware->createChild("Display");
+    pelmDisplay->setAttribute("VRAMSize", hw.ulVRAMSizeMB);
+    pelmDisplay->setAttribute("monitorCount", hw.cMonitors);
+    pelmDisplay->setAttribute("accelerate3D", hw.fAccelerate3D);
+
+    if (m->sv >= SettingsVersion_v1_8)
+        pelmDisplay->setAttribute("accelerate2DVideo", hw.fAccelerate2DVideo);
+
+    xml::ElementNode *pelmVRDP = pelmHardware->createChild("RemoteDisplay");
+    pelmVRDP->setAttribute("enabled", hw.vrdpSettings.fEnabled);
+    pelmVRDP->setAttribute("port", hw.vrdpSettings.ulPort);
+    if (hw.vrdpSettings.strNetAddress.length())
+        pelmVRDP->setAttribute("netAddress", hw.vrdpSettings.strNetAddress);
+    const char *pcszAuthType;
+    switch (hw.vrdpSettings.authType)
+    {
+        case VRDPAuthType_Guest:    pcszAuthType = "Guest";    break;
+        case VRDPAuthType_External: pcszAuthType = "External"; break;
+        default: /*case VRDPAuthType_Null:*/ pcszAuthType = "Null"; break;
+    }
+    pelmVRDP->setAttribute("authType", pcszAuthType);
+
+    if (hw.vrdpSettings.ulAuthTimeout != 0)
+        pelmVRDP->setAttribute("authTimeout", hw.vrdpSettings.ulAuthTimeout);
+    if (hw.vrdpSettings.fAllowMultiConnection)
+        pelmVRDP->setAttribute("allowMultiConnection", hw.vrdpSettings.fAllowMultiConnection);
+    if (hw.vrdpSettings.fReuseSingleConnection)
+        pelmVRDP->setAttribute("reuseSingleConnection", hw.vrdpSettings.fReuseSingleConnection);
+
+    xml::ElementNode *pelmBIOS = pelmHardware->createChild("BIOS");
+    pelmBIOS->createChild("ACPI")->setAttribute("enabled", hw.biosSettings.fACPIEnabled);
+    pelmBIOS->createChild("IOAPIC")->setAttribute("enabled", hw.biosSettings.fIOAPICEnabled);
+
+    xml::ElementNode *pelmLogo = pelmBIOS->createChild("Logo");
+    pelmLogo->setAttribute("fadeIn", hw.biosSettings.fLogoFadeIn);
+    pelmLogo->setAttribute("fadeOut", hw.biosSettings.fLogoFadeOut);
+    pelmLogo->setAttribute("displayTime", hw.biosSettings.ulLogoDisplayTime);
+    if (hw.biosSettings.strLogoImagePath.length())
+        pelmLogo->setAttribute("imagePath", hw.biosSettings.strLogoImagePath);
+
+    const char *pcszBootMenu;
+    switch (hw.biosSettings.biosBootMenuMode)
+    {
+        case BIOSBootMenuMode_Disabled: pcszBootMenu = "Disabled"; break;
+        case BIOSBootMenuMode_MenuOnly: pcszBootMenu = "MenuOnly"; break;
+        default: /*BIOSBootMenuMode_MessageAndMenu*/ pcszBootMenu = "MessageAndMenu"; break;
+    }
+    pelmBIOS->createChild("BootMenu")->setAttribute("mode", pcszBootMenu);
+    pelmBIOS->createChild("TimeOffset")->setAttribute("value", hw.biosSettings.llTimeOffset);
+    pelmBIOS->createChild("PXEDebug")->setAttribute("enabled", hw.biosSettings.fPXEDebugEnabled);
+
+    xml::ElementNode *pelmDVD = pelmHardware->createChild("DVDDrive");
+    pelmDVD->setAttribute("passthrough", hw.dvdDrive.fPassThrough);
+    if (!hw.dvdDrive.uuid.isEmpty())
+        pelmDVD->createChild("Image")->setAttribute("uuid", makeString(hw.dvdDrive.uuid));
+    else if (hw.dvdDrive.strHostDriveSrc.length())
+        pelmDVD->createChild("HostDrive")->setAttribute("src", hw.dvdDrive.strHostDriveSrc);
+
+    xml::ElementNode *pelmFloppy = pelmHardware->createChild("FloppyDrive");
+    pelmFloppy->setAttribute("enabled", hw.floppyDrive.fEnabled);
+    if (!hw.floppyDrive.uuid.isEmpty())
+        pelmFloppy->createChild("Image")->setAttribute("uuid", makeString(hw.floppyDrive.uuid));
+    else if (hw.floppyDrive.strHostDriveSrc.length())
+        pelmFloppy->createChild("HostDrive")->setAttribute("src", hw.floppyDrive.strHostDriveSrc);
+
+    xml::ElementNode *pelmUSB = pelmHardware->createChild("USBController");
+    pelmUSB->setAttribute("enabled", hw.usbController.fEnabled);
+    pelmUSB->setAttribute("enabledEhci", hw.usbController.fEnabledEHCI);
+
+    writeUSBDeviceFilters(*pelmUSB,
+                          hw.usbController.llDeviceFilters,
+                          false);               // fHostMode
+
+    xml::ElementNode *pelmNetwork = pelmHardware->createChild("Network");
+    for (NetworkAdaptersList::const_iterator it = hw.llNetworkAdapters.begin();
+         it != hw.llNetworkAdapters.end();
+         ++it)
+    {
+        const NetworkAdapter &nic = *it;
+
+        xml::ElementNode *pelmAdapter = pelmNetwork->createChild("Adapter");
+        pelmAdapter->setAttribute("slot", nic.ulSlot);
+        pelmAdapter->setAttribute("enabled", nic.fEnabled);
+        pelmAdapter->setAttribute("MACAddress", nic.strMACAddress);
+        pelmAdapter->setAttribute("cable", nic.fCableConnected);
+        pelmAdapter->setAttribute("speed", nic.ulLineSpeed);
+        if (nic.fTraceEnabled)
+        {
+            pelmAdapter->setAttribute("trace", nic.fTraceEnabled);
+            pelmAdapter->setAttribute("tracefile", nic.strTraceFile);
+        }
+
+        const char *pcszType;
+        switch (nic.type)
+        {
+            case NetworkAdapterType_Am79C973:   pcszType = "Am79C973"; break;
+            case NetworkAdapterType_I82540EM:   pcszType = "82540EM"; break;
+            case NetworkAdapterType_I82543GC:   pcszType = "82543GC"; break;
+            case NetworkAdapterType_I82545EM:   pcszType = "82545EM"; break;
+            default: /*case NetworkAdapterType_Am79C970A:*/  pcszType = "Am79C970A"; break;
+        }
+        pelmAdapter->setAttribute("type", pcszType);
+
+        xml::ElementNode *pelmNAT;
+        switch (nic.mode)
+        {
+            case NetworkAttachmentType_NAT:
+                pelmNAT = pelmAdapter->createChild("NAT");
+                if (nic.strName.length())
+                    pelmNAT->setAttribute("network", nic.strName);
             break;
-        default:
-            throw xml::ENotImplemented (RT_SRC_POS);
-    }
-
-    if (aSigned)
-    {
-        int64_t result;
-        int vrc = RTStrToInt64Full (aValue, 0, &result);
-        if (RT_SUCCESS(vrc))
-        {
-            if (result >= (int64_t) aMin && result <= (int64_t) aMax)
-                return (uint64_t) result;
-        }
-    }
-    else
-    {
-        uint64_t result;
-        int vrc = RTStrToUInt64Full (aValue, 0, &result);
-        if (RT_SUCCESS(vrc))
-        {
-            if (result >= aMin && result <= aMax)
-                return result;
-        }
-    }
-
-    throw ENoConversion(com::Utf8StrFmt("'%s' is not integer", aValue));
-}
-
-template<> bool FromString <bool> (const char *aValue)
-{
-    if (aValue == NULL)
-        throw ENoValue();
-
-    if (strcmp (aValue, "true") == 0 ||
-        strcmp (aValue, "1") == 0)
-        /* This contradicts the XML Schema's interpretation of boolean: */
-        //strcmp (aValue, "yes") == 0 ||
-        //strcmp (aValue, "on") == 0)
-        return true;
-    else if (strcmp (aValue, "false") == 0 ||
-             strcmp (aValue, "0") == 0)
-            /* This contradicts the XML Schema's interpretation of boolean: */
-            //strcmp (aValue, "no") == 0 ||
-            //strcmp (aValue, "off") == 0)
-        return false;
-
-    throw ENoConversion(com::Utf8StrFmt("'%s' is not bool", aValue));
-}
-
-template<> RTTIMESPEC FromString <RTTIMESPEC> (const char *aValue)
-{
-    if (aValue == NULL)
-        throw ENoValue();
-
-    /* Parse ISO date (xsd:dateTime). The format is:
-     * '-'? yyyy '-' mm '-' dd 'T' hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
-     * where zzzzzz is: (('+' | '-') hh ':' mm) | 'Z' */
-    uint32_t yyyy = 0;
-    uint16_t mm = 0, dd = 0, hh = 0, mi = 0, ss = 0;
-    char buf [256];
-    if (strlen (aValue) > RT_ELEMENTS (buf) - 1 ||
-        sscanf (aValue, "%d-%hu-%huT%hu:%hu:%hu%s",
-                &yyyy, &mm, &dd, &hh, &mi, &ss, buf) == 7)
-    {
-        /* currently, we accept only the UTC timezone ('Z'),
-         * ignoring fractional seconds, if present */
-        if (buf [0] == 'Z' ||
-            (buf [0] == '.' && buf [strlen (buf) - 1] == 'Z'))
-        {
-            RTTIME time = { yyyy, (uint8_t) mm, 0, 0, (uint8_t) dd,
-                            (uint8_t) hh, (uint8_t) mi, (uint8_t) ss, 0,
-                            RTTIME_FLAGS_TYPE_UTC };
-            if (RTTimeNormalize (&time))
-            {
-                RTTIMESPEC timeSpec;
-                if (RTTimeImplode (&timeSpec, &time))
-                    return timeSpec;
-            }
-        }
-        else
-            throw ENoConversion(com::Utf8StrFmt("'%s' is not UTC date", aValue));
-    }
-
-    throw ENoConversion(com::Utf8StrFmt("'%s' is not ISO date", aValue));
-}
-
-stdx::char_auto_ptr FromString (const char *aValue, size_t *aLen)
-{
-    if (aValue == NULL)
-        throw ENoValue();
-
-    /* each two chars produce one byte */
-    size_t len = strlen (aValue) / 2;
-
-    /* therefore, the original length must be even */
-    if (len % 2 != 0)
-        throw ENoConversion(com::Utf8StrFmt("'%.*s' is not binary data",
-                                            aLen, aValue));
-
-    stdx::char_auto_ptr result (new char [len]);
-
-    const char *src = aValue;
-    char *dst = result.get();
-
-    for (size_t i = 0; i < len; ++ i, ++ dst)
-    {
-        *dst = sFromHex (*src ++) << 4;
-        *dst |= sFromHex (*src ++);
-    }
-
-    if (aLen != NULL)
-        *aLen = len;
-
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// type -> string conversions
-//////////////////////////////////////////////////////////////////////////////
-
-stdx::char_auto_ptr ToStringInteger (uint64_t aValue, unsigned int aBase,
-                                     bool aSigned, int aBits)
-{
-    unsigned int flags = RTSTR_F_SPECIAL;
-    if (aSigned)
-        flags |= RTSTR_F_VALSIGNED;
-
-    /* maximum is binary representation + terminator */
-    size_t len = aBits + 1;
-
-    switch (aBits)
-    {
-        case 8:
-            flags |= RTSTR_F_8BIT;
+
+            case NetworkAttachmentType_Bridged:
+                pelmAdapter->createChild("BridgedInterface")->setAttribute("name", nic.strName);
             break;
-        case 16:
-            flags |= RTSTR_F_16BIT;
+
+            case NetworkAttachmentType_Internal:
+                pelmAdapter->createChild("InternalNetwork")->setAttribute("name", nic.strName);
             break;
-        case 32:
-            flags |= RTSTR_F_32BIT;
+
+            case NetworkAttachmentType_HostOnly:
+                pelmAdapter->createChild("HostOnlyInterface")->setAttribute("name", nic.strName);
             break;
-        case 64:
-            flags |= RTSTR_F_64BIT;
+
+            default: /*case NetworkAttachmentType_Null:*/
             break;
-        default:
-            throw xml::ENotImplemented (RT_SRC_POS);
-    }
-
-    stdx::char_auto_ptr result (new char [len]);
-    if (aBase == 0)
-        aBase = 10;
-    int vrc = RTStrFormatNumber (result.get(), aValue, aBase, 0, 0, flags);
-    if (RT_SUCCESS(vrc))
-        return result;
-
-    throw xml::EIPRTFailure (vrc);
-}
-
-template<> stdx::char_auto_ptr ToString <bool> (const bool &aValue,
-                                                unsigned int aExtra /* = 0 */)
-{
-    /* Convert to the canonical form according to XML Schema */
-    stdx::char_auto_ptr result (duplicate_chars (aValue ? "true" : "false"));
-    return result;
-}
-
-template<> stdx::char_auto_ptr ToString <RTTIMESPEC> (const RTTIMESPEC &aValue,
-                                                      unsigned int aExtra /* = 0 */)
-{
-    RTTIME time;
-    if (!RTTimeExplode (&time, &aValue))
-        throw ENoConversion(com::Utf8StrFmt("timespec %lld ms is invalid",
-                                            RTTimeSpecGetMilli (&aValue)));
-
-    /* Store ISO date (xsd:dateTime). The format is:
-     * '-'? yyyy '-' mm '-' dd 'T' hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
-     * where zzzzzz is: (('+' | '-') hh ':' mm) | 'Z' */
-    char buf [256];
-    RTStrPrintf (buf, sizeof (buf),
-                "%04ld-%02hd-%02hdT%02hd:%02hd:%02hdZ",
-                time.i32Year, (uint16_t) time.u8Month, (uint16_t) time.u8MonthDay,
-                (uint16_t) time.u8Hour, (uint16_t) time.u8Minute, (uint16_t) time.u8Second);
-
-    stdx::char_auto_ptr result (duplicate_chars (buf));
-    return result;
-}
-
-stdx::char_auto_ptr ToString (const char *aData, size_t aLen)
-{
-    /* each byte will produce two hex digits and there will be a null
-     * terminator */
-    stdx::char_auto_ptr result (new char [aLen * 2 + 1]);
-
-    const char *src = aData;
-    char *dst =  result.get();
-
-    for (size_t i = 0; i < aLen; ++ i, ++ src)
-    {
-        *dst++ = sToHex ((*src) >> 4);
-        *dst++ = sToHex ((*src) & 0xF);
-    }
-
-    *dst = '\0';
-
-    return result;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// XmlKeyBackend Class
-//////////////////////////////////////////////////////////////////////////////
-
-class XmlKeyBackend : public Key::Backend
-{
-public:
-
-    XmlKeyBackend (xmlNodePtr aNode);
-    ~XmlKeyBackend();
-
-    const char *name() const;
-    void setName (const char *aName);
-    const char *value (const char *aName) const;
-    void setValue (const char *aName, const char *aValue);
-
-    Key::List keys (const char *aName = NULL) const;
-    Key findKey (const char *aName) const;
-
-    Key appendKey (const char *aName);
-    void zap();
-
-    void *position() const { return mNode; }
-
-private:
-
-    xmlNodePtr mNode;
-
-    xmlChar *mNodeText;
-
-    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP (XmlKeyBackend);
-
-    friend class XmlTreeBackend;
-};
-
-XmlKeyBackend::XmlKeyBackend (xmlNodePtr aNode)
-    : mNode (aNode), mNodeText (NULL)
-{
-    AssertReturnVoid (mNode);
-    AssertReturnVoid (mNode->type == XML_ELEMENT_NODE);
-}
-
-XmlKeyBackend::~XmlKeyBackend()
-{
-    xmlFree (mNodeText);
-}
-
-const char *XmlKeyBackend::name() const
-{
-    return mNode ? (char *) mNode->name : NULL;
-}
-
-void XmlKeyBackend::setName (const char *aName)
-{
-    throw xml::ENotImplemented (RT_SRC_POS);
-}
-
-const char *XmlKeyBackend::value (const char *aName) const
-{
-    if (!mNode)
-        return NULL;
-
-    if (aName == NULL)
-    {
-        /* @todo xmlNodeListGetString (,,1) returns NULL for things like
-         * <Foo></Foo> and may want to return "" in this case to distinguish
-         * from <Foo/> (where NULL is pretty much expected). */
-        if (!mNodeText)
-            unconst(mNodeText) =
-                xmlNodeListGetString (mNode->doc, mNode->children, 0);
-        return (char *) mNodeText;
-    }
-
-    xmlAttrPtr attr = xmlHasProp (mNode, (const xmlChar *) aName);
-    if (!attr)
-        return NULL;
-
-    if (attr->type == XML_ATTRIBUTE_NODE)
-    {
-        /* @todo for now, we only understand the most common case: only 1 text
-         * node comprises the attribute's contents. Otherwise we'd need to
-         * return a newly allocated string buffer to the caller that
-         * concatenates all text nodes and obey him to free it or provide our
-         * own internal map of attribute=value pairs and return const pointers
-         * to values from this map. */
-        if (attr->children != NULL &&
-            attr->children->next == NULL &&
-            (attr->children->type == XML_TEXT_NODE ||
-             attr->children->type == XML_CDATA_SECTION_NODE))
-            return (char *) attr->children->content;
-    }
-    else if (attr->type == XML_ATTRIBUTE_DECL)
-    {
-        return (char *) ((xmlAttributePtr) attr)->defaultValue;
-    }
-
-    return NULL;
-}
-
-void XmlKeyBackend::setValue (const char *aName, const char *aValue)
-{
-    if (!mNode)
-        return;
-
-    if (aName == NULL)
-    {
-        xmlChar *value = (xmlChar *) aValue;
-        if (value != NULL)
-        {
-            value = xmlEncodeSpecialChars (mNode->doc, value);
-            if (value == NULL)
-                throw std::bad_alloc();
-        }
-
-        xmlNodeSetContent (mNode, value);
-
-        if (value != (xmlChar *) aValue)
-            xmlFree (value);
-
-        /* outdate the node text holder */
-        if (mNodeText != NULL)
-        {
-            xmlFree (mNodeText);
-            mNodeText = NULL;
-        }
-
-        return;
-    }
-
-    if (aValue == NULL)
-    {
-        /* remove the attribute if it exists */
-        xmlAttrPtr attr = xmlHasProp (mNode, (const xmlChar *) aName);
-        if (attr != NULL)
-        {
-            int rc = xmlRemoveProp (attr);
-            if (rc != 0)
-                throw xml::EInvalidArg (RT_SRC_POS);
-        }
-        return;
-    }
-
-    xmlAttrPtr attr = xmlSetProp (mNode, (const xmlChar *) aName,
-                                  (const xmlChar *) aValue);
-    if (attr == NULL)
-        throw std::bad_alloc();
-}
-
-Key::List XmlKeyBackend::keys (const char *aName /* = NULL */) const
-{
-    Key::List list;
-
-    if (!mNode)
-        return list;
-
-    for (xmlNodePtr node = mNode->children; node; node = node->next)
-    {
-        if (node->type == XML_ELEMENT_NODE)
-        {
-            if (aName == NULL ||
-                strcmp (aName, (char *) node->name) == 0)
-                list.push_back (Key (new XmlKeyBackend (node)));
-        }
-    }
-
-    return list;
-}
-
-Key XmlKeyBackend::findKey (const char *aName) const
-{
-    Key key;
-
-    if (!mNode)
-        return key;
-
-    for (xmlNodePtr node = mNode->children; node; node = node->next)
-    {
-        if (node->type == XML_ELEMENT_NODE)
-        {
-            if (aName == NULL ||
-                strcmp (aName, (char *) node->name) == 0)
-            {
-                key = Key (new XmlKeyBackend (node));
-                break;
-            }
-        }
-    }
-
-    return key;
-}
-
-Key XmlKeyBackend::appendKey (const char *aName)
-{
-    if (!mNode)
-        return Key();
-
-    xmlNodePtr node = xmlNewChild (mNode, NULL, (const xmlChar *) aName, NULL);
-    if (node == NULL)
-        throw std::bad_alloc();
-
-    return Key (new XmlKeyBackend (node));
-}
-
-void XmlKeyBackend::zap()
-{
-    if (!mNode)
-        return;
-
-    xmlUnlinkNode (mNode);
-    xmlFreeNode (mNode);
-    mNode = NULL;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// XmlTreeBackend Class
-//////////////////////////////////////////////////////////////////////////////
-
-struct XmlTreeBackend::Data
-{
-    Data() : ctxt (NULL), doc (NULL)
-           , inputResolver (NULL)
-           , autoConverter (NULL), oldVersion (NULL) {}
-
-    xmlParserCtxtPtr ctxt;
-    xmlDocPtr doc;
-
-    Key root;
-
-    InputResolver *inputResolver;
-
-    AutoConverter *autoConverter;
-    char *oldVersion;
-
-    std::auto_ptr <stdx::exception_trap_base> trappedErr;
-
-    /**
-     * This is to avoid throwing exceptions while in libxml2 code and
-     * redirect them to our level instead. Also used to perform clean up
-     * by deleting the I/O stream instance and self when requested.
-     */
-    struct IOCtxt
-    {
-        IOCtxt (xml::Stream *aStream, std::auto_ptr <stdx::exception_trap_base> &aErr)
-            : stream (aStream), deleteStreamOnClose (false)
-            , err (aErr) {}
-
-        template <typename T>
-        void setErr (const T& aErr) { err.reset (new stdx::exception_trap <T> (aErr)); }
-
-        void resetErr() { err.reset(); }
-
-        xml::Stream *stream;
-        bool deleteStreamOnClose;
-
-        std::auto_ptr <stdx::exception_trap_base> &err;
-    };
-
-    struct InputCtxt : public IOCtxt
-    {
-        InputCtxt (xml::Input *aInput, std::auto_ptr <stdx::exception_trap_base> &aErr)
-            : IOCtxt (aInput, aErr), input (aInput) {}
-
-        xml::Input *input;
-    };
-
-    struct OutputCtxt : public IOCtxt
-    {
-        OutputCtxt (xml::Output *aOutput, std::auto_ptr <stdx::exception_trap_base> &aErr)
-            : IOCtxt (aOutput, aErr), output (aOutput) {}
-
-        xml::Output *output;
-    };
-};
-
-XmlTreeBackend::XmlTreeBackend()
-    : m (new Data())
-{
-    /* create a parser context */
-    m->ctxt = xmlNewParserCtxt();
-    if (m->ctxt == NULL)
-        throw std::bad_alloc();
-}
-
-XmlTreeBackend::~XmlTreeBackend()
-{
-    reset();
-
-    xmlFreeParserCtxt (m->ctxt);
-    m->ctxt = NULL;
-}
-
-void XmlTreeBackend::setInputResolver (InputResolver &aResolver)
-{
-    m->inputResolver = &aResolver;
-}
-
-void XmlTreeBackend::resetInputResolver()
-{
-    m->inputResolver = NULL;
-}
-
-void XmlTreeBackend::setAutoConverter (AutoConverter &aConverter)
-{
-    m->autoConverter = &aConverter;
-}
-
-void XmlTreeBackend::resetAutoConverter()
-{
-    m->autoConverter = NULL;
-}
-
-const char *XmlTreeBackend::oldVersion() const
-{
-    return m->oldVersion;
-}
-
-extern "C" xmlGenericErrorFunc xsltGenericError;
-extern "C" void *xsltGenericErrorContext;
-
-void XmlTreeBackend::rawRead (xml::Input &aInput, const char *aSchema /* = NULL */,
-                              int aFlags /* = 0 */)
-{
-    /* Reset error variables used to memorize exceptions while inside the
-     * libxml2 code. */
-    m->trappedErr.reset();
-
-    /* We use the global lock for the whole duration of this method to serialize
-     * access to thread-unsafe xmlGetExternalEntityLoader() and some other
-     * calls. It means that only one thread is able to parse an XML stream at a
-     * time but another choice would be to patch libxml2/libxslt which is
-     * unwanted now for several reasons. Search for "thread-safe" to find all
-     * unsafe cases. */
-    xml::GlobalLock global;
-    global.setExternalEntityLoader(ExternalEntityLoader);
-
-    sThat = this;
-    xmlDocPtr doc = NULL;
-
-    try
-    {
-        /* Note: when parsing we use XML_PARSE_NOBLANKS to instruct libxml2 to
-         * remove text nodes that contain only blanks. This is important because
-         * otherwise xmlSaveDoc() won't be able to do proper indentation on
-         * output. */
-        /* parse the stream */
-        /* NOTE: new InputCtxt instance will be deleted when the stream is closed by
-         * the libxml2 API (e.g. when calling xmlFreeParserCtxt()) */
-        doc = xmlCtxtReadIO (m->ctxt,
-                             ReadCallback, CloseCallback,
-                             new Data::InputCtxt (&aInput, m->trappedErr),
-                             aInput.uri(), NULL,
-                             XML_PARSE_NOBLANKS);
-        if (doc == NULL)
-        {
-            /* look if there was a forwared exception from the lower level */
-            if (m->trappedErr.get() != NULL)
-                m->trappedErr->rethrow();
-
-            throw xml::XmlError(xmlCtxtGetLastError (m->ctxt));
-        }
-
-        char *oldVersion = NULL;
-
-        /* perform automatic document transformation if necessary */
-        if (m->autoConverter != NULL &&
-            m->autoConverter->
-                needsConversion (Key (new XmlKeyBackend (xmlDocGetRootElement (doc))),
-                                 &oldVersion))
-        {
-            xmlDocPtr xsltDoc = NULL;
-            xsltStylesheetPtr xslt = NULL;
-            char *errorStr = NULL;
-
-            xmlGenericErrorFunc oldXsltGenericError = xsltGenericError;
-            void *oldXsltGenericErrorContext = xsltGenericErrorContext;
-
-            try
-            {
-                /* parse the XSLT template */
-                {
-                    xml::Input *xsltInput =
-                        m->inputResolver->resolveEntity
-                            (m->autoConverter->templateUri(), NULL);
-                    /* NOTE: new InputCtxt instance will be deleted when the
-                     * stream is closed by the libxml2 API */
-                    xsltDoc = xmlCtxtReadIO (m->ctxt,
-                                             ReadCallback, CloseCallback,
-                                             new Data::InputCtxt (xsltInput, m->trappedErr),
-                                             m->autoConverter->templateUri(),
-                                             NULL, 0);
-                    delete xsltInput;
-                }
-
-                if (xsltDoc == NULL)
-                {
-                    /* look if there was a forwared exception from the lower level */
-                    if (m->trappedErr.get() != NULL)
-                        m->trappedErr->rethrow();
-
-                    throw xml::XmlError(xmlCtxtGetLastError (m->ctxt));
-                }
-
-                /* setup stylesheet compilation and transformation error
-                 * reporting. Note that we could create a new transform context
-                 * for doing xsltApplyStylesheetUser and use
-                 * xsltSetTransformErrorFunc() on it to set a dedicated error
-                 * handler but as long as we already do several non-thread-safe
-                 * hacks, this is not really important. */
-
-                xsltGenericError = ValidityErrorCallback;
-                xsltGenericErrorContext = &errorStr;
-
-                xslt = xsltParseStylesheetDoc (xsltDoc);
-                if (xslt == NULL)
-                {
-                    if (errorStr != NULL)
-                        throw xml::LogicError (errorStr);
-                    /* errorStr is freed in catch(...) below */
-
-                    throw xml::LogicError (RT_SRC_POS);
-                }
-
-                /* repeat transformations until autoConverter is satisfied */
-                do
-                {
-                    xmlDocPtr newDoc = xsltApplyStylesheet (xslt, doc, NULL);
-                    if (newDoc == NULL && errorStr == NULL)
-                        throw xml::LogicError (RT_SRC_POS);
-
-                    if (errorStr != NULL)
-                    {
-                        xmlFreeDoc (newDoc);
-                        throw xml::RuntimeError(errorStr);
-                        /* errorStr is freed in catch(...) below */
-                    }
-
-                    /* replace the old document on success */
-                    xmlFreeDoc (doc);
-                    doc = newDoc;
-                }
-                while (m->autoConverter->
-                       needsConversion (Key (new XmlKeyBackend (xmlDocGetRootElement (doc))),
-                                        NULL));
-
-                RTStrFree (errorStr);
-
-                /* NOTE: xsltFreeStylesheet() also fress the document
-                 * passed to xsltParseStylesheetDoc(). */
-                xsltFreeStylesheet (xslt);
-
-                /* restore the previous generic error func */
-                xsltGenericError = oldXsltGenericError;
-                xsltGenericErrorContext = oldXsltGenericErrorContext;
-            }
-            catch (...)
-            {
-                RTStrFree (errorStr);
-
-                /* NOTE: xsltFreeStylesheet() also fress the document
-                 * passed to xsltParseStylesheetDoc(). */
-                if (xslt != NULL)
-                    xsltFreeStylesheet (xslt);
-                else if (xsltDoc != NULL)
-                    xmlFreeDoc (xsltDoc);
-
-                /* restore the previous generic error func */
-                xsltGenericError = oldXsltGenericError;
-                xsltGenericErrorContext = oldXsltGenericErrorContext;
-
-                RTStrFree (oldVersion);
-
-                throw;
-            }
-        }
-
-        /* validate the document */
-        if (aSchema != NULL)
-        {
-            xmlSchemaParserCtxtPtr schemaCtxt = NULL;
-            xmlSchemaPtr schema = NULL;
-            xmlSchemaValidCtxtPtr validCtxt = NULL;
-            char *errorStr = NULL;
-
-            try
-            {
-                bool valid = false;
-
-                schemaCtxt = xmlSchemaNewParserCtxt (aSchema);
-                if (schemaCtxt == NULL)
-                    throw xml::LogicError (RT_SRC_POS);
-
-                /* set our error handlers */
-                xmlSchemaSetParserErrors (schemaCtxt, ValidityErrorCallback,
-                                          ValidityWarningCallback, &errorStr);
-                xmlSchemaSetParserStructuredErrors (schemaCtxt,
-                                                    StructuredErrorCallback,
-                                                    &errorStr);
-                /* load schema */
-                schema = xmlSchemaParse (schemaCtxt);
-                if (schema != NULL)
-                {
-                    validCtxt = xmlSchemaNewValidCtxt (schema);
-                    if (validCtxt == NULL)
-                        throw xml::LogicError (RT_SRC_POS);
-
-                    /* instruct to create default attribute's values in the document */
-                    if (aFlags & Read_AddDefaults)
-                        xmlSchemaSetValidOptions (validCtxt, XML_SCHEMA_VAL_VC_I_CREATE);
-
-                    /* set our error handlers */
-                    xmlSchemaSetValidErrors (validCtxt, ValidityErrorCallback,
-                                             ValidityWarningCallback, &errorStr);
-
-                    /* finally, validate */
-                    valid = xmlSchemaValidateDoc (validCtxt, doc) == 0;
-                }
-
-                if (!valid)
-                {
-                    /* look if there was a forwared exception from the lower level */
-                    if (m->trappedErr.get() != NULL)
-                        m->trappedErr->rethrow();
-
-                    if (errorStr == NULL)
-                        throw xml::LogicError (RT_SRC_POS);
-
-                    throw xml::RuntimeError(errorStr);
-                    /* errorStr is freed in catch(...) below */
-                }
-
-                RTStrFree (errorStr);
-
-                xmlSchemaFreeValidCtxt (validCtxt);
-                xmlSchemaFree (schema);
-                xmlSchemaFreeParserCtxt (schemaCtxt);
-            }
-            catch (...)
-            {
-                RTStrFree (errorStr);
-
-                if (validCtxt)
-                    xmlSchemaFreeValidCtxt (validCtxt);
-                if (schema)
-                    xmlSchemaFree (schema);
-                if (schemaCtxt)
-                    xmlSchemaFreeParserCtxt (schemaCtxt);
-
-                RTStrFree (oldVersion);
-
-                throw;
-            }
-        }
-
-        /* reset the previous tree on success */
-        reset();
-
-        m->doc = doc;
-        /* assign the root key */
-        m->root = Key (new XmlKeyBackend (xmlDocGetRootElement (m->doc)));
-
-        /* memorize the old version string also used as a flag that
-         * the conversion has been performed (transfers ownership) */
-        m->oldVersion = oldVersion;
-
-        sThat = NULL;
-    }
-    catch (...)
-    {
-        if (doc != NULL)
-            xmlFreeDoc (doc);
-
-        sThat = NULL;
-
-        throw;
-    }
-}
-
-void XmlTreeBackend::rawWrite (xml::Output &aOutput)
-{
-    /* reset error variables used to memorize exceptions while inside the
-     * libxml2 code */
-    m->trappedErr.reset();
-
-    /* set up an input stream for parsing the document. This will be deleted
-     * when the stream is closed by the libxml2 API (e.g. when calling
-     * xmlFreeParserCtxt()). */
-    Data::OutputCtxt *outputCtxt =
-        new Data::OutputCtxt (&aOutput, m->trappedErr);
-
-    /* serialize to the stream */
-
-    xmlIndentTreeOutput = 1;
-    xmlTreeIndentString = "  ";
-    xmlSaveNoEmptyTags = 0;
-
-    xmlSaveCtxtPtr saveCtxt = xmlSaveToIO (WriteCallback, CloseCallback,
-                                           outputCtxt, NULL,
-                                           XML_SAVE_FORMAT);
-    if (saveCtxt == NULL)
-        throw xml::LogicError (RT_SRC_POS);
-
-    long rc = xmlSaveDoc (saveCtxt, m->doc);
-    if (rc == -1)
-    {
-        /* look if there was a forwared exception from the lower level */
-        if (m->trappedErr.get() != NULL)
-            m->trappedErr->rethrow();
-
-        /* there must be an exception from the Output implementation,
-         * otherwise the save operation must always succeed. */
-        throw xml::LogicError (RT_SRC_POS);
-    }
-
-    xmlSaveClose (saveCtxt);
-}
-
-void XmlTreeBackend::reset()
-{
-    RTStrFree (m->oldVersion);
-    m->oldVersion = NULL;
-
-    if (m->doc)
-    {
-        /* reset the root key's node */
-        GetKeyBackend (m->root)->mNode = NULL;
-        /* free the document*/
-        xmlFreeDoc (m->doc);
-        m->doc = NULL;
-    }
-}
-
-Key &XmlTreeBackend::rootKey() const
-{
-    return m->root;
-}
-
-/* static */
-int XmlTreeBackend::ReadCallback (void *aCtxt, char *aBuf, int aLen)
-{
-    AssertReturn(aCtxt != NULL, 0);
-
-    Data::InputCtxt *ctxt = static_cast <Data::InputCtxt *> (aCtxt);
-
-    /* To prevent throwing exceptions while inside libxml2 code, we catch
-     * them and forward to our level using a couple of variables. */
-    try
-    {
-        return ctxt->input->read (aBuf, aLen);
-    }
-    catch (const xml::EIPRTFailure &err) { ctxt->setErr (err); }
-    catch (const xml::Error &err) { ctxt->setErr (err); }
-    catch (const std::exception &err) { ctxt->setErr (err); }
-    catch (...) { ctxt->setErr (xml::LogicError (RT_SRC_POS)); }
-
-    return -1 /* failure */;
-}
-
-/* static */
-int XmlTreeBackend::WriteCallback (void *aCtxt, const char *aBuf, int aLen)
-{
-    AssertReturn(aCtxt != NULL, 0);
-
-    Data::OutputCtxt *ctxt = static_cast <Data::OutputCtxt *> (aCtxt);
-
-    /* To prevent throwing exceptions while inside libxml2 code, we catch
-     * them and forward to our level using a couple of variables. */
-    try
-    {
-        return ctxt->output->write (aBuf, aLen);
-    }
-    catch (const xml::EIPRTFailure &err) { ctxt->setErr (err); }
-    catch (const xml::Error &err) { ctxt->setErr (err); }
-    catch (const std::exception &err) { ctxt->setErr (err); }
-    catch (...) { ctxt->setErr (xml::LogicError (RT_SRC_POS)); }
-
-    return -1 /* failure */;
-}
-
-/* static */
-int XmlTreeBackend::CloseCallback (void *aCtxt)
-{
-    AssertReturn(aCtxt != NULL, 0);
-
-    Data::IOCtxt *ctxt = static_cast <Data::IOCtxt *> (aCtxt);
-
-    /* To prevent throwing exceptions while inside libxml2 code, we catch
-     * them and forward to our level using a couple of variables. */
-    try
-    {
-        /// @todo there is no explicit close semantics in Stream yet
-#if 0
-        ctxt->stream->close();
-#endif
-
-        /* perform cleanup when necessary */
-        if (ctxt->deleteStreamOnClose)
-            delete ctxt->stream;
-
-        delete ctxt;
-
-        return 0 /* success */;
-    }
-    catch (const xml::EIPRTFailure &err) { ctxt->setErr (err); }
-    catch (const xml::Error &err) { ctxt->setErr (err); }
-    catch (const std::exception &err) { ctxt->setErr (err); }
-    catch (...) { ctxt->setErr (xml::LogicError (RT_SRC_POS)); }
-
-    return -1 /* failure */;
-}
-
-/* static */
-void XmlTreeBackend::ValidityErrorCallback (void *aCtxt, const char *aMsg, ...)
-{
-    AssertReturnVoid (aCtxt != NULL);
-    AssertReturnVoid (aMsg != NULL);
-
-    char * &str = *(char * *) aCtxt;
-
-    char *newMsg = NULL;
-    {
-        va_list args;
-        va_start (args, aMsg);
-        RTStrAPrintfV (&newMsg, aMsg, args);
-        va_end (args);
-    }
-
-    AssertReturnVoid (newMsg != NULL);
-
-    /* strip spaces, trailing EOLs and dot-like char */
-    size_t newMsgLen = strlen (newMsg);
-    while (newMsgLen && strchr (" \n.?!", newMsg [newMsgLen - 1]))
-        -- newMsgLen;
-
-    /* anything left? */
-    if (newMsgLen > 0)
-    {
-        if (str == NULL)
-        {
-            str = newMsg;
-            newMsg [newMsgLen] = '\0';
-        }
-        else
-        {
-            /* append to the existing string */
-            size_t strLen = strlen (str);
-            char *newStr = (char *) RTMemRealloc (str, strLen + 2 + newMsgLen + 1);
-            AssertReturnVoid (newStr != NULL);
-
-            memcpy (newStr + strLen, ".\n", 2);
-            memcpy (newStr + strLen + 2, newMsg, newMsgLen);
-            newStr [strLen + 2 + newMsgLen] = '\0';
-            str = newStr;
-            RTStrFree (newMsg);
-        }
-    }
-}
-
-/* static */
-void XmlTreeBackend::ValidityWarningCallback (void *aCtxt, const char *aMsg, ...)
-{
-    NOREF (aCtxt);
-    NOREF (aMsg);
-}
-
-/* static */
-void XmlTreeBackend::StructuredErrorCallback (void *aCtxt, xmlErrorPtr aErr)
-{
-    AssertReturnVoid (aCtxt != NULL);
-    AssertReturnVoid (aErr != NULL);
-
-    char * &str = *(char * *) aCtxt;
-
-    char *newMsg = xml::XmlError::Format (aErr);
-    AssertReturnVoid (newMsg != NULL);
-
-    if (str == NULL)
-        str = newMsg;
-    else
-    {
-        /* append to the existing string */
-        size_t newMsgLen = strlen (newMsg);
-        size_t strLen = strlen (str);
-        char *newStr = (char *) RTMemRealloc (str, strLen + newMsgLen + 2);
-        AssertReturnVoid (newStr != NULL);
-
-        memcpy (newStr + strLen, ".\n", 2);
-        memcpy (newStr + strLen + 2, newMsg, newMsgLen);
-        str = newStr;
-        RTStrFree (newMsg);
-    }
-}
-
-/* static */
-XmlTreeBackend *XmlTreeBackend::sThat = NULL;
-
-/* static */
-xmlParserInputPtr XmlTreeBackend::ExternalEntityLoader (const char *aURI,
-                                                        const char *aID,
-                                                        xmlParserCtxtPtr aCtxt)
-{
-    AssertReturn(sThat != NULL, NULL);
-
-    if (sThat->m->inputResolver == NULL)
-        return xml::GlobalLock::callDefaultLoader(aURI, aID, aCtxt);
-
-    /* To prevent throwing exceptions while inside libxml2 code, we catch
-     * them and forward to our level using a couple of variables. */
-    try
-    {
-        xml::Input *input = sThat->m->inputResolver->resolveEntity (aURI, aID);
-        if (input == NULL)
-            return NULL;
-
-        Data::InputCtxt *ctxt = new Data::InputCtxt (input, sThat->m->trappedErr);
-        ctxt->deleteStreamOnClose = true;
-
-        /* create an input buffer with custom hooks */
-        xmlParserInputBufferPtr bufPtr =
-            xmlParserInputBufferCreateIO (ReadCallback, CloseCallback,
-                                          ctxt, XML_CHAR_ENCODING_NONE);
-        if (bufPtr)
-        {
-            /* create an input stream */
-            xmlParserInputPtr inputPtr =
-                xmlNewIOInputStream (aCtxt, bufPtr, XML_CHAR_ENCODING_NONE);
-
-            if (inputPtr != NULL)
-            {
-                /* pass over the URI to the stream struct (it's NULL by
-                 * default) */
-                inputPtr->filename =
-                    (char *) xmlCanonicPath ((const xmlChar *) input->uri());
-                return inputPtr;
-            }
-        }
-
-        /* either of libxml calls failed */
-
-        if (bufPtr)
-            xmlFreeParserInputBuffer (bufPtr);
-
-        delete input;
-        delete ctxt;
-
-        throw std::bad_alloc();
-    }
-    catch (const xml::EIPRTFailure &err) { sThat->m->trappedErr.reset (stdx::new_exception_trap (err)); }
-    catch (const xml::Error &err) { sThat->m->trappedErr.reset (stdx::new_exception_trap (err)); }
-    catch (const std::exception &err) { sThat->m->trappedErr.reset (stdx::new_exception_trap (err)); }
-    catch (...) { sThat->m->trappedErr.reset (stdx::new_exception_trap (xml::LogicError (RT_SRC_POS))); }
-
-    return NULL;
-}
-
-
-} /* namespace settings */
-
+        }
+    }
+
+    xml::ElementNode *pelmPorts = pelmHardware->createChild("UART");
+    for (SerialPortsList::const_iterator it = hw.llSerialPorts.begin();
+         it != hw.llSerialPorts.end();
+         ++it)
+    {
+        const SerialPort &port = *it;
+        xml::ElementNode *pelmPort = pelmPorts->createChild("Port");
+        pelmPort->setAttribute("slot", port.ulSlot);
+        pelmPort->setAttribute("enabled", port.fEnabled);
+        pelmPort->setAttributeHex("IOBase", port.ulIOBase);
+        pelmPort->setAttribute("IRQ", port.ulIRQ);
+
+        const char *pcszHostMode;
+        switch (port.portMode)
+        {
+            case PortMode_HostPipe: pcszHostMode = "HostPipe"; break;
+            case PortMode_HostDevice: pcszHostMode = "HostDevice"; break;
+            case PortMode_RawFile: pcszHostMode = "RawFile"; break;
+            default: /*case PortMode_Disconnected:*/ pcszHostMode = "Disconnected"; break;
+        }
+        pelmPort->setAttribute("hostMode", pcszHostMode);
+    }
+
+    pelmPorts = pelmHardware->createChild("LPT");
+    for (ParallelPortsList::const_iterator it = hw.llParallelPorts.begin();
+         it != hw.llParallelPorts.end();
+         ++it)
+    {
+        const ParallelPort &port = *it;
+        xml::ElementNode *pelmPort = pelmPorts->createChild("Port");
+        pelmPort->setAttribute("slot", port.ulSlot);
+        pelmPort->setAttribute("enabled", port.fEnabled);
+        pelmPort->setAttributeHex("IOBase", port.ulIOBase);
+        pelmPort->setAttribute("IRQ", port.ulIRQ);
+        if (port.strPath.length())
+            pelmPort->setAttribute("path", port.strPath);
+    }
+
+    xml::ElementNode *pelmAudio = pelmHardware->createChild("AudioAdapter");
+    pelmAudio->setAttribute("controller", (hw.audioAdapter.controllerType == AudioControllerType_SB16) ? "SB16" : "AC97");
+
+    const char *pcszDriver;
+    switch (hw.audioAdapter.driverType)
+    {
+        case AudioDriverType_WinMM: pcszDriver = "WinMM"; break;
+        case AudioDriverType_DirectSound: pcszDriver = "DirectSound"; break;
+        case AudioDriverType_SolAudio: pcszDriver = "SolAudio"; break;
+        case AudioDriverType_ALSA: pcszDriver = "ALSA"; break;
+        case AudioDriverType_Pulse: pcszDriver = "Pulse"; break;
+        case AudioDriverType_OSS: pcszDriver = "OSS"; break;
+        case AudioDriverType_CoreAudio: pcszDriver = "CoreAudio"; break;
+        case AudioDriverType_MMPM: pcszDriver = "MMPM"; break;
+        default: /*case AudioDriverType_Null:*/ pcszDriver = "Null"; break;
+    }
+    pelmAudio->setAttribute("driver", pcszDriver);
+
+    pelmAudio->setAttribute("enabled", hw.audioAdapter.fEnabled);
+
+    xml::ElementNode *pelmSharedFolders = pelmHardware->createChild("SharedFolders");
+    for (SharedFoldersList::const_iterator it = hw.llSharedFolders.begin();
+         it != hw.llSharedFolders.end();
+         ++it)
+    {
+        const SharedFolder &sf = *it;
+        xml::ElementNode *pelmThis = pelmSharedFolders->createChild("SharedFolder");
+        pelmThis->setAttribute("name", sf.strName);
+        pelmThis->setAttribute("hostPath", sf.strHostPath);
+        pelmThis->setAttribute("writable", sf.fWritable);
+    }
+
+    xml::ElementNode *pelmClip = pelmHardware->createChild("Clipboard");
+    const char *pcszClip;
+    switch (hw.clipboardMode)
+    {
+        case ClipboardMode_Disabled: pcszClip = "Disabled"; break;
+        case ClipboardMode_HostToGuest: pcszClip = "HostToGuest"; break;
+        case ClipboardMode_GuestToHost: pcszClip = "GuestToHost"; break;
+        default: /*case ClipboardMode_Bidirectional:*/ pcszClip = "Bidirectional"; break;
+    }
+    pelmClip->setAttribute("mode", pcszClip);
+
+    xml::ElementNode *pelmGuest = pelmHardware->createChild("Guest");
+    pelmGuest->setAttribute("memoryBalloonSize", hw.ulMemoryBalloonSize);
+    pelmGuest->setAttribute("statisticsUpdateInterval", hw.ulStatisticsUpdateInterval);
+
+    xml::ElementNode *pelmGuestProps = pelmHardware->createChild("GuestProperties");
+    for (GuestPropertiesList::const_iterator it = hw.llGuestProperties.begin();
+         it != hw.llGuestProperties.end();
+         ++it)
+    {
+        const GuestProperty &prop = *it;
+        xml::ElementNode *pelmProp = pelmGuestProps->createChild("GuestProperty");
+        pelmProp->setAttribute("name", prop.strName);
+        pelmProp->setAttribute("value", prop.strValue);
+        pelmProp->setAttribute("timestamp", prop.timestamp);
+        pelmProp->setAttribute("flags", prop.strFlags);
+    }
+
+    if (hw.strNotificationPatterns.length())
+        pelmGuestProps->setAttribute("notificationPatterns", hw.strNotificationPatterns);
+}
+
+/**
+ * Creates a <StorageControllers> node under elmParent and then writes out the XML
+ * keys under that. Called for both the <Machine> node and for snapshots.
+ * @param elmParent
+ * @param st
+ */
+void MachineConfigFile::writeStorageControllers(xml::ElementNode &elmParent,
+                                                const Storage &st)
+{
+    xml::ElementNode *pelmStorageControllers = elmParent.createChild("StorageControllers");
+
+    for (StorageControllersList::const_iterator it = st.llStorageControllers.begin();
+         it != st.llStorageControllers.end();
+         ++it)
+    {
+        const StorageController &sc = *it;
+
+        xml::ElementNode *pelmController = pelmStorageControllers->createChild("StorageController");
+        pelmController->setAttribute("name", sc.strName);
+
+        const char *pcszType;
+        switch (sc.controllerType)
+        {
+            case StorageControllerType_IntelAhci: pcszType = "AHCI"; break;
+            case StorageControllerType_LsiLogic: pcszType = "LsiLogic"; break;
+            case StorageControllerType_BusLogic: pcszType = "BusLogic"; break;
+            case StorageControllerType_PIIX4: pcszType = "PIIX4"; break;
+            case StorageControllerType_ICH6: pcszType = "ICH6"; break;
+            default: /*case StorageControllerType_PIIX3:*/ pcszType = "PIIX3"; break;
+        }
+        pelmController->setAttribute("type", pcszType);
+
+        pelmController->setAttribute("PortCount", sc.ulPortCount);
+
+        if (sc.controllerType == StorageControllerType_IntelAhci)
+        {
+            pelmController->setAttribute("IDE0MasterEmulationPort", sc.lIDE0MasterEmulationPort);
+            pelmController->setAttribute("IDE0SlaveEmulationPort", sc.lIDE0SlaveEmulationPort);
+            pelmController->setAttribute("IDE1MasterEmulationPort", sc.lIDE1MasterEmulationPort);
+            pelmController->setAttribute("IDE1SlaveEmulationPort", sc.lIDE1SlaveEmulationPort);
+        }
+
+        for (AttachedDevicesList::const_iterator it2 = sc.llAttachedDevices.begin();
+             it2 != sc.llAttachedDevices.end();
+             ++it2)
+        {
+            const AttachedDevice &dev = *it2;
+
+            xml::ElementNode *pelmDevice = pelmController->createChild("AttachedDevice");
+            pelmDevice->setAttribute("type", "HardDisk");
+
+            pelmDevice->setAttribute("port", dev.lPort);
+            pelmDevice->setAttribute("device", dev.lDevice);
+            pelmDevice->createChild("Image")->setAttribute("uuid", makeString(dev.uuid));
+        }
+    }
+}
+
+/**
+ * Writes a single snapshot into the DOM tree. Initially this gets called from MachineConfigFile::write()
+ * for the root snapshot of a machine, if present; elmParent then points to the <Snapshots> node under the
+ * <Machine> node to which <Snapshot> must be added. This may then recurse for child snapshots.
+ * @param elmParent
+ * @param snap
+ */
+void MachineConfigFile::writeSnapshot(xml::ElementNode &elmParent,
+                                      const Snapshot &snap)
+{
+    xml::ElementNode *pelmSnapshot = elmParent.createChild("Snapshot");
+
+    pelmSnapshot->setAttribute("uuid", makeString(snap.uuid));
+    pelmSnapshot->setAttribute("name", snap.strName);
+    pelmSnapshot->setAttribute("Description", snap.strDescription);
+
+    pelmSnapshot->setAttribute("timeStamp", makeString(snap.timestamp));
+
+    if (snap.strStateFile.length())
+        pelmSnapshot->setAttribute("stateFile", snap.strStateFile);
+
+    writeHardware(*pelmSnapshot, snap.hardware);
+    writeStorageControllers(*pelmSnapshot, snap.storage);
+
+    if (snap.llChildSnapshots.size())
+    {
+        xml::ElementNode *pelmChildren = pelmSnapshot->createChild("Snapshots");
+        for (SnapshotsList::const_iterator it = snap.llChildSnapshots.begin();
+             it != snap.llChildSnapshots.end();
+             ++it)
+        {
+            const Snapshot &child = *it;
+            writeSnapshot(*pelmChildren, child);
+        }
+    }
+}
+
+/**
+ * Called from Main code to write a machine config file to disk. This builds a DOM tree from
+ * the member variables and then writes the XML file; it throws xml::Error instances on errors,
+ * in particular if the file cannot be written.
+ */
+void MachineConfigFile::write(const com::Utf8Str &strFilename)
+{
+    m->strFilename = strFilename;
+
+    createStubDocument();
+
+    xml::ElementNode *pelmMachine = m->pelmRoot->createChild("Machine");
+
+    pelmMachine->setAttribute("uuid", makeString(uuid));
+    pelmMachine->setAttribute("name", strName);
+    if (!fNameSync)
+        pelmMachine->setAttribute("nameSync", fNameSync);
+    if (strDescription.length())
+        pelmMachine->createChild("Description")->addContent(strDescription);
+    pelmMachine->setAttribute("OSType", strOsType);
+    if (strStateFile.length())
+        pelmMachine->setAttribute("stateFile", strStateFile);
+    if (!uuidCurrentSnapshot.isEmpty())
+        pelmMachine->setAttribute("currentSnapshot", makeString(uuidCurrentSnapshot));
+    if (strSnapshotFolder.length())
+        pelmMachine->setAttribute("snapshotFolder", strSnapshotFolder);
+    if (!fCurrentStateModified)
+        pelmMachine->setAttribute("currentStateModified", fCurrentStateModified);
+    pelmMachine->setAttribute("lastStateChange", makeString(timeLastStateChange));
+    if (fAborted)
+        pelmMachine->setAttribute("aborted", fAborted);
+
+    writeExtraData(*pelmMachine, mapExtraDataItems);
+
+    if (llFirstSnapshot.size())
+        writeSnapshot(*pelmMachine, llFirstSnapshot.front());
+
+    writeHardware(*pelmMachine, hardwareMachine);
+
+    writeStorageControllers(*pelmMachine, storageMachine);
+
+    // now go write the XML
+    xml::XmlFileWriter writer(*m->pDoc);
+    writer.write(m->strFilename.c_str());
+
+    m->fFileExists = true;
+
+    clearDocument();
+}
+

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

@@ -38 +38 @@
     xml::XmlFileParser parser;
     xml::Document doc;
-    parser.read(m_strPath.raw(),
+    parser.read(m_strPath,
                 doc);
 
     const xml::ElementNode *pRootElem = doc.getRootElement();
-    if (strcmp(pRootElem->getName(), "Envelope"))
+    if (pRootElem && strcmp(pRootElem->getName(), "Envelope"))
         throw OVFLogicError(N_("Root element in OVF file must be \"Envelope\"."));
 

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -497 +497 @@
 }
 
+bool Node::nameEquals(const char *pcsz) const
+{
+    if (m->pcszName == pcsz)
+        return true;
+    if (m->pcszName == NULL)
+        return false;
+    if (pcsz == NULL)
+        return false;
+    return !strcmp(m->pcszName, pcsz);
+}
+
+
 /**
  * Returns the value of a node. If this node is an attribute, returns
@@ -732 +744 @@
 /**
  * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as a string.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param str out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, iprt::MiniString &str) const
+{
+    const Node* pAttr;
+    if ((pAttr = findAttribute(pcszMatch)))
+    {
+        str = pAttr->getValue();
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as a signed integer. This calls
+ * RTStrToInt32Ex internally and will only output the integer if that
+ * function returns no error.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param i out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, int32_t &i) const
+{
+    const char *pcsz;
+    if (    (getAttributeValue(pcszMatch, pcsz))
+         && (VINF_SUCCESS == RTStrToInt32Ex(pcsz, NULL, 0, &i))
+       )
+        return true;
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as an unsigned integer.This calls
+ * RTStrToUInt32Ex internally and will only output the integer if that
+ * function returns no error.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param i out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, uint32_t &i) const
+{
+    const char *pcsz;
+    if (    (getAttributeValue(pcszMatch, pcsz))
+         && (VINF_SUCCESS == RTStrToUInt32Ex(pcsz, NULL, 0, &i))
+       )
+        return true;
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
  * name and returns its value as a signed long integer. This calls
  * RTStrToInt64Ex internally and will only output the integer if that
@@ -744 +818 @@
     const char *pcsz;
     if (    (getAttributeValue(pcszMatch, pcsz))
-         && (VINF_SUCCESS == RTStrToInt64Ex(pcsz, NULL, 10, &i))
+         && (VINF_SUCCESS == RTStrToInt64Ex(pcsz, NULL, 0, &i))
        )
         return true;
@@ -765 +839 @@
     const char *pcsz;
     if (    (getAttributeValue(pcszMatch, pcsz))
-         && (VINF_SUCCESS == RTStrToUInt64Ex(pcsz, NULL, 10, &i))
+         && (VINF_SUCCESS == RTStrToUInt64Ex(pcsz, NULL, 0, &i))
        )
         return true;
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as a boolean. This accepts "true", "false",
+ * "yes", "no", "1" or "0" as valid values.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param i out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, bool &f) const
+{
+    const char *pcsz;
+    if (getAttributeValue(pcszMatch, pcsz))
+    {
+        if (    (!strcmp(pcsz, "true"))
+             || (!strcmp(pcsz, "yes"))
+             || (!strcmp(pcsz, "1"))
+           )
+        {
+            f = true;
+            return true;
+        }
+        if (    (!strcmp(pcsz, "false"))
+             || (!strcmp(pcsz, "no"))
+             || (!strcmp(pcsz, "0"))
+           )
+        {
+            f = false;
+            return true;
+        }
+    }
 
     return false;
@@ -870 +979 @@
 }
 
+AttributeNode* ElementNode::setAttribute(const char *pcszName, int32_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RI32", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint32_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RU32", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, int64_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RI64", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint64_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RU64", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttributeHex(const char *pcszName, uint32_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "0x%RX32", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, bool f)
+{
+    return setAttribute(pcszName, (f) ? "true" : "false");
+}
 
 AttributeNode::AttributeNode()
@@ -910 +1068 @@
  * NULL, like this:
  * <code>
- *      xml::Node node;         // should point to an element
+ *      xml::ElementNode node;               // should point to an element
  *      xml::NodesLoop loop(node, "child");  // find all "child" elements under node
- *      const xml::Node *pChild = NULL;
+ *      const xml::ElementNode *pChild = NULL;
  *      while (pChild = loop.forAllNodes())
  *          ...;
@@ -1018 +1176 @@
 /**
  * Returns the root element of the document, or NULL if the document is empty.
+ * Const variant.
  * @return
  */
 const ElementNode* Document::getRootElement() const
+{
+    return m->pRootElement;
+}
+
+/**
+ * Returns the root element of the document, or NULL if the document is empty.
+ * Non-const variant.
+ * @return
+ */
+ElementNode* Document::getRootElement()
 {
     return m->pRootElement;
@@ -1151 +1320 @@
  * @param doc out: document to be reset and filled with data according to file contents.
  */
-void XmlFileParser::read(const char *pcszFilename,
+void XmlFileParser::read(const iprt::MiniString &strFilename,
                          Document &doc)
 {
@@ -1157 +1326 @@
 //     global.setExternalEntityLoader(ExternalEntityLoader);
 
-    m->strXmlFilename = pcszFilename;
+    m->strXmlFilename = strFilename;
+    const char *pcszFilename = strFilename.c_str();
 
     ReadContext context(pcszFilename);