Changeset 7341 in vbox

Timestamp:

Mar 6, 2008 6:05:00 PM (17 years ago)

Author:

vboxsync

Message:

Main/Settings: Implemented support for settings file auto-conversion at VBoxSVC startup (#2705).

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (7 diffs)
• VirtualBoxImpl.cpp (modified) (13 diffs)
• VirtualBoxImplExtra.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (5 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• include/VirtualBoxImpl.h (modified) (8 diffs)
• include/VirtualBoxXMLUtil.h (modified) (3 diffs)
• xml/SettingsConverter.xsl (modified) (6 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -85 +85 @@
     "<!-- innotek VirtualBox Machine Configuration -->" RTFILE_LINEFEED
     "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" "
-        "version=\"" VBOX_XML_VERSION "-" VBOX_XML_PLATFORM "\">" RTFILE_LINEFEED
+        "version=\"" VBOX_XML_VERSION_FULL "\">" RTFILE_LINEFEED
     "</VirtualBox>" RTFILE_LINEFEED
 };
@@ -1296 +1296 @@
 
     mData->mConfigFileFull.cloneTo (aFilePath);
+    return S_OK;
+}
+
+STDMETHODIMP Machine::
+COMGETTER(SettingsFileVersion) (BSTR *aSettingsFileVersion)
+{
+    if (!aSettingsFileVersion)
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    mData->mSettingsFileVersion.cloneTo (aSettingsFileVersion);
     return S_OK;
 }
@@ -2198 +2213 @@
 
             /* save settings on success */
-            rc = VirtualBox::saveSettingsTree (tree, file);
+            rc = VirtualBox::saveSettingsTree (tree, file,
+                                               mData->mSettingsFileVersion);
             CheckComRCReturnRC (rc);
         }
@@ -3856 +3872 @@
         XmlTreeBackend tree;
 
-        rc = VirtualBox::loadSettingsTree_FirstTime (tree, file);
+        rc = VirtualBox::loadSettingsTree_FirstTime (tree, file,
+                                                     mData->mSettingsFileVersion);
         CheckComRCThrowRC (rc);
 
@@ -5149 +5166 @@
 
         /* save the settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file);
+        rc = VirtualBox::saveSettingsTree (tree, file,
+                                          mData->mSettingsFileVersion);
         CheckComRCThrowRC (rc);
     }
@@ -5228 +5246 @@
 
         /* save settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file);
+        rc = VirtualBox::saveSettingsTree (tree, file,
+                                           mData->mSettingsFileVersion);
         CheckComRCReturnRC (rc);
     }
@@ -5837 +5856 @@
 
         /* save settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file);
+        rc = VirtualBox::saveSettingsTree (tree, file,
+                                           mData->mSettingsFileVersion);
         CheckComRCReturnRC (rc);
     }

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -78 +78 @@
     "<!-- innotek VirtualBox Global Configuration -->" RTFILE_LINEFEED
     "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" "
-        "version=\"" VBOX_XML_VERSION "-" VBOX_XML_PLATFORM "\">" RTFILE_LINEFEED
+        "version=\"" VBOX_XML_VERSION_FULL "\">" RTFILE_LINEFEED
     "  <Global>"RTFILE_LINEFEED
     "    <MachineRegistry/>"RTFILE_LINEFEED
@@ -91 +91 @@
 Bstr VirtualBox::sVersion;
 
+// static
+Bstr VirtualBox::sSettingsFormatVersion;
+
 // constructor / destructor
 /////////////////////////////////////////////////////////////////////////////
@@ -139 +142 @@
         sVersion = VBOX_VERSION_STRING;
     LogFlowThisFunc (("Version: %ls\n", sVersion.raw()));
+
+    if (sSettingsFormatVersion.isNull())
+        sSettingsFormatVersion = VBOX_XML_VERSION_FULL;
+    LogFlowThisFunc (("Settings Format Version: %ls\n",
+                      sSettingsFormatVersion.raw()));
 
     /* Get the VirtualBox home directory. */
@@ -201 +209 @@
             XmlTreeBackend tree;
 
-            rc = VirtualBox::loadSettingsTree_FirstTime (tree, file);
+            rc = VirtualBox::loadSettingsTree_FirstTime (tree, file,
+                                                         mData.mSettingsFileVersion);
             CheckComRCThrowRC (rc);
 
@@ -452 +461 @@
     CheckComRCReturnRC (autoCaller.rc());
 
+    /* mHomeDir is const and doesn't need a lock */
     mData.mHomeDir.cloneTo (aHomeFolder);
+    return S_OK;
+}
+
+STDMETHODIMP VirtualBox::COMGETTER(SettingsFilePath) (BSTR *aSettingsFilePath)
+{
+    if (!aSettingsFilePath)
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* mCfgFile.mName is const and doesn't need a lock */
+    mData.mCfgFile.mName.cloneTo (aSettingsFilePath);
+    return S_OK;
+}
+
+STDMETHODIMP VirtualBox::
+COMGETTER(SettingsFileVersion) (BSTR *aSettingsFileVersion)
+{
+    if (!aSettingsFileVersion)
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    mData.mSettingsFileVersion.cloneTo (aSettingsFileVersion);
+    return S_OK;
+}
+
+STDMETHODIMP VirtualBox::
+COMGETTER(SettingsFormatVersion) (BSTR *aSettingsFormatVersion)
+{
+    if (!aSettingsFormatVersion)
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    sSettingsFormatVersion.cloneTo (aSettingsFormatVersion);
     return S_OK;
 }
@@ -1880 +1931 @@
 
             /* save settings on success */
-            rc = VirtualBox::saveSettingsTree (tree, file);
+            rc = VirtualBox::saveSettingsTree (tree, file,
+                                               mData.mSettingsFileVersion);
             CheckComRCReturnRC (rc);
         }
@@ -2089 +2141 @@
 {
     return E_NOTIMPL;
+}
+
+STDMETHODIMP VirtualBox::SaveSettings()
+{
+    return saveSettings();
 }
 
@@ -3720 +3777 @@
 
         /* save the settings on success */
-        rc = VirtualBox::saveSettingsTree (tree, file);
+        rc = VirtualBox::saveSettingsTree (tree, file,
+                                           mData.mSettingsFileVersion);
         CheckComRCThrowRC (rc);
     }
@@ -4108 +4166 @@
  *                          values for 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 */
@@ -4114 +4174 @@
                                       bool aValidate,
                                       bool aCatchLoadErrors,
-                                      bool aAddDefaults)
+                                      bool aAddDefaults,
+                                      Utf8Str *aFormatVersion /* = NULL */)
 {
     using namespace settings;
@@ -4120 +4181 @@
     try
     {
-        SettingsInputResolver resolver = SettingsInputResolver();
-
-        aTree.setInputResolver (resolver);
+        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->isNull())
+                *aFormatVersion = VBOX_XML_VERSION_FULL;
+        }
     }
     catch (const EIPRTFailure &err)
@@ -4159 +4238 @@
  * throw something.
  *
- * @param aTree Tree to save.
- * @param aFile File to save the tree to.
+ * @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,
-                                             settings::File &aFile)
+                                      settings::File &aFile,
+                                      Utf8Str &aFormatVersion)
 {
     using namespace settings;
@@ -4171 +4253 @@
     {
         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 EIPRTFailure &err)

trunk/src/VBox/Main/VirtualBoxImplExtra.cpp

@@ -31 +31 @@
 #include "xml_SettingsConverter_xsl.h"
 
-/** 
+/**
  * 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.
  */
 settings::Input *
-VirtualBox::SettingsInputResolver::resolveEntity (const char *aURI, const char *aID)
+VirtualBox::SettingsTreeHelper::resolveEntity (const char *aURI, const char *aID)
 {
     if (strcmp (aURI, VBOX_XML_SCHEMA_COMMON) == 0)
@@ -57 +57 @@
     }
 
+    if (strcmp (aURI, VBOX_XML_SETTINGS_CONVERTER) == 0)
+    {
+        return new settings::
+            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. The
+ * implementation must return a string representing the old version
+ * (before conversion) in the @c aOldVersion argument -- 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.
+ *
+ * @param aRoot                 Root settings key.
+ * @param aOldVersionString     Old version string (allocated by
+ *                              RTStrDup or such).
+ */
+bool VirtualBox::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 */
+                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 *VirtualBox::SettingsTreeHelper::templateUri() const
+{
+    return VBOX_XML_SETTINGS_CONVERTER;
+}
+

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

@@ -877 +877 @@
   <interface
     name="IVirtualBox" extends="$dispatched"
-    uuid="64f652cb-7fdf-482d-ae19-4dbb289a5ca0"
+    uuid="3d835db8-0d0b-4d3e-a83e-ed1dea86c4f5"
     wsmap="managed"
   >
@@ -916 +916 @@
         places where relative paths are allowed (unless otherwise
         expressly indicated).
+      </desc>
+    </attribute>
+
+                <attribute name="settingsFilePath" type="wstring" readonly="yes">
+                        <desc>
+                                Full name of the global settings file.
+                                The value of this property corresponds to the value of
+                                <link to="#homeFolder"/> plus <tt>/VirtualBox.xml</tt>.
+                        </desc>
+                </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 <tt>x</tt> and <tt>y</tt> are the major and the minor format
+                                versions, and <tt>platform</tt> 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 bacup copies of the old settings files before saving,
+                                etc.
+
+        <see>settingsFormatVersion</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 <tt>x</tt> and <tt>y</tt> are the major and the minor format
+                                versions, and <tt>platform</tt> 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>
@@ -2029 +2089 @@
     </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.
+                        </desc>
+                </method>
+
   </interface>
 
@@ -2357 +2430 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="2830ce8c-be5b-4660-b8d5-65d913005b4f"
+     uuid="c929abcc-5373-4ed9-9b56-201430b37868"
      wsmap="managed"
      >
@@ -2654 +2727 @@
     </attribute>
 
+                <attribute name="settingsFileVersion" type="wstring" readonly="yes">
+                        <desc>
+                                Current version of the format of the settings file of this machine
+                                (<link to="#settingsFilePath"/>).
+
+                                The version string has the following format:
+                                <pre>x.y-platform</pre>
+                                where <tt>x</tt> and <tt>y</tt> are the major and the minor format
+                                versions, and <tt>platform</tt> 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 bacup copies of the old settings files before saving,
+                                etc.
+
+                                <see>IVirtualBox::settingsFormatVersion</see>
+                        </desc>
+                </attribute>
+
     <attribute name="settingsModified" type="boolean" readonly="yes">
       <desc>

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

@@ -137 +137 @@
         Bstr mConfigFile;
         Bstr mConfigFileFull;
+
+        Utf8Str mSettingsFileVersion;
 
         BOOL mAccessible;
@@ -465 +467 @@
     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);

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

@@ -109 +109 @@
     STDMETHOD(COMGETTER(Version)) (BSTR *aVersion);
     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);
@@ -179 +182 @@
                                       BSTR *aChanged, BSTR *aValues);
 
+    STDMETHOD(SaveSettings)();
+
     /* public methods only for internal purposes */
 
@@ -257 +262 @@
     const Bstr &settingsFileName() { return mData.mCfgFile.mName; }
 
-    class SettingsInputResolver : public settings::XmlTreeBackend::InputResolver
+    class SettingsTreeHelper : public settings::XmlTreeBackend::InputResolver
+                             , public settings::XmlTreeBackend::AutoConverter
     {
     public:
 
+        // InputResolver interface
         settings::Input *resolveEntity (const char *aURI, const char *aID);
+
+        // AutoConverter interface
+        bool needsConversion (const settings::Key &aRoot, char *&aOldVersion) const;
+        const char *templateUri() const;
     };
 
@@ -268 +279 @@
                                      bool aValidate,
                                      bool aCatchLoadErrors,
-                                     bool aAddDefaults);
+                                     bool aAddDefaults,
+                                     Utf8Str *aFormatVersion = NULL);
 
     /**
@@ -275 +287 @@
      * 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,
-                                               settings::File &aFile)
-    {
-        return loadSettingsTree (aTree, aFile, true, true, true);
+                                               settings::File &aFile,
+                                               Utf8Str &aFormatVersion)
+    {
+        return loadSettingsTree (aTree, aFile, true, true, true,
+                                 &aFormatVersion);
     }
 
@@ -310 +327 @@
 
     static HRESULT saveSettingsTree (settings::TreeBackend &aTree,
-                                     settings::File &aFile);
+                                     settings::File &aFile,
+                                     Utf8Str &aFormatVersion);
 
     static HRESULT handleUnexpectedExceptions (RT_SRC_POS_DECL);
@@ -389 +407 @@
 
         CfgFile mCfgFile;
+
+        Utf8Str mSettingsFileVersion;
 
         MachineList mMachines;
@@ -445 +465 @@
 
     static Bstr sVersion;
+    static Bstr sSettingsFormatVersion;
 
     static DECLCALLBACK(int) ClientWatcher (RTTHREAD thread, void *pvUser);

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

@@ -24 +24 @@
 #define VBOX_XML_NAMESPACE      "http://www.innotek.de/VirtualBox-settings"
 
+/** VirtualBox XML settings version number substring ("x.y")  */
 #define VBOX_XML_VERSION "1.2"
 
-/** VirtualBox XML settings version string */
+/** VirtualBox XML settings version platform substring */
 #if defined (RT_OS_DARWIN)
 #   define VBOX_XML_PLATFORM     "macosx"
@@ -47 +48 @@
 #endif
 
+/** VirtualBox XML settings full version string ("x.y-platform") */
+#define VBOX_XML_VERSION_FULL   VBOX_XML_VERSION "-" VBOX_XML_PLATFORM
+
 /** VirtualBox XML common settings version string */
 #define VBOX_XML_PLATFORM_COMMON  "common"
@@ -54 +58 @@
 #define VBOX_XML_SCHEMA_COMMON  "VirtualBox-settings-" VBOX_XML_PLATFORM_COMMON ".xsd"
 
+/** VirtualBox XML settings converter file */
+#define VBOX_XML_SETTINGS_CONVERTER "SettingsConverter.xsl"
+
 #endif /* ____H_VIRTUALBOXXMLUTIL */

trunk/src/VBox/Main/xml/SettingsConverter.xsl

@@ -7 +7 @@
  *  Template to convert old VirtualBox settings files to the most recent format.
 
-     Copyright (C) 2006-2007 innotek GmbH
-    
+     Copyright (C) 2006-2008 innotek GmbH
+
      This file is part of VirtualBox Open Source Edition (OSE), as
      available from http://www.virtualbox.org. This file is free software;
@@ -30 +30 @@
 <xsl:variable name="recentVer" select="1.2"/>
 
-<xsl:variable name="curVer" select="substring-before(/VirtualBox/@version, '-')"/>
-<xsl:variable name="curVerPlat" select="substring-after(/VirtualBox/@version, '-')"/>
-<xsl:variable name="curVerFull" select="/VirtualBox/@version"/>
+<xsl:variable name="curVer" select="substring-before(/vb:VirtualBox/@version, '-')"/>
+<xsl:variable name="curVerPlat" select="substring-after(/vb:VirtualBox/@version, '-')"/>
+<xsl:variable name="curVerFull" select="/vb:VirtualBox/@version"/>
 
 <xsl:template match="/">
-  <xsl:text>&#x0A;</xsl:text>
-  <xsl:comment> Automatically converted from version <xsl:value-of select="$curVerFull"/> to version <xsl:value-of select="$recentVer"/> </xsl:comment>
-  <xsl:text>&#x0A;</xsl:text>
+  <xsl:comment> Automatically converted from version '<xsl:value-of select="$curVerFull"/>' to version '<xsl:value-of select="concat($recentVer,'-',$curVerPlat)"/>' </xsl:comment>
   <xsl:copy>
     <xsl:apply-templates select="@*|node()"/>
@@ -48 +46 @@
 <xsl:template match="/comment()">
   <xsl:copy-of select="."/>
-  <xsl:text>&#x0A;</xsl:text>
 </xsl:template>
 
@@ -62 +59 @@
 
 <!--
- *  Forbid unsupported VirtualBox settings versions
+ *  Forbid all unsupported VirtualBox settings versions
 -->
 
-<xsl:template match="/VirtualBox">
+<xsl:template match="/vb:VirtualBox">
   <xsl:if test="@version=concat($recentVer,'-',$curVerPlat)">
-  <xsl:message terminate="yes">
-Cannot convert from version <xsl:value-of select="@version"/> to version <xsl:value-of select="$recentVer"/>!
+    <xsl:message terminate="yes">
+Cannot convert settings from version '<xsl:value-of select="@version"/>' to version '<xsl:value-of select="concat($recentVer,'-',$curVerPlat)"/>'.
 The source is already at the most recent version.
-  </xsl:message>
+    </xsl:message>
   </xsl:if>
   <xsl:message terminate="yes">
-Cannot convert from version <xsl:value-of select="@version"/> to version <xsl:value-of select="$recentVer"/>!
+Cannot convert settings from version '<xsl:value-of select="@version"/>' to version '<xsl:value-of select="concat($recentVer,'-',$curVerPlat)"/>'.
 The source version is not supported.
   </xsl:message>
@@ -79 +76 @@
 
 <!--
- *  Accept supported settings versions
+ *  Accept supported settings versions (source setting filess to convert)
 -->
-<xsl:template match="/VirtualBox[@version='1.1-windows' or
-                                 @version='1.1-linux']">
+
+<!-- @todo temporary -->
+<xsl:template match="/vb:VirtualBox[substring-before(@version,'-')='1.999']">
+  <xsl:copy>
+    <xsl:attribute name="version"><xsl:value-of select="concat($recentVer,'-',$curVerPlat)"/></xsl:attribute>
+    <xsl:apply-templates select="node()"/>
+  </xsl:copy>
+</xsl:template>
+
+<xsl:template match="/vb:VirtualBox[substring-before(@version,'-')='1.1']">
   <xsl:copy>
     <xsl:attribute name="version"><xsl:value-of select="concat($recentVer,'-',$curVerPlat)"/></xsl:attribute>
@@ -91 +96 @@
 <!--
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *  Individual convertions
+ *  Individual conversions
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -->